diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 17:50:07 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 17:50:07 +0100 |
| commit | a2a17bba926d1465108ab55c47f9145494ff78e5 (patch) | |
| tree | f72fbf0ffd636f9f7ac39f49b2a2448ae9a6762c /data | |
| parent | b37d8c0821997038c96723d85bcc95734af0c159 (diff) | |
more work on wild encounter
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/field_move_scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | data/wild_encounter.s | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index fd2ff3b01..76f2aac6b 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -116,7 +116,7 @@ Route111_EventScript_2907FB:: @ 82907FB specialvar VAR_RESULT, sub_81393FC compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_290829 - special rock_smash_wild_pokemon_encounter + special RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate diff --git a/data/specials.inc b/data/specials.inc index d9cfcc6b0..e9e608880 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -181,7 +181,7 @@ gSpecials:: @ 81DBA64 def_special sub_813BF60 def_special sub_813BA60 def_special sub_813BF7C - def_special rock_smash_wild_pokemon_encounter + def_special RockSmashWildEncounter def_special GabbyAndTyGetBattleNum def_special GabbyAndTyAfterInterview def_special GabbyAndTyBeforeInterview diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 8540fefac..d45acf415 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -9,10 +9,10 @@ .incbin "baserom.gba", 0x55370c, 0x188 -gUnknown_08553894:: @ 8553894 +gBattlePyramidWildMonHeaders:: @ 8553894 .incbin "baserom.gba", 0x553894, 0x180 -gUnknown_08553A14:: @ 8553A14 +gBattlePikeWildMonHeaders:: @ 8553A14 .incbin "baserom.gba", 0x553a14, 0x64 gUnknown_08553A78:: @ 8553A78 |