diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:42 -0500 |
| commit | 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 (patch) | |
| tree | 5aaaa5828622b42023320e211cffd3dd4bb3feb8 /data-de | |
| parent | aa8299821dca148ecfd5d6bfb77641043e01da5c (diff) | |
Unify 'map object' and 'field object' terms into 'event object'
Diffstat (limited to 'data-de')
| -rw-r--r-- | data-de/event_scripts.s | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 0a2752e20..226024ac1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3,7 +3,7 @@ #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" @@ -1845,11 +1845,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return RustboroCity_EventScript_1A016C:: @ 81A016C - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1863,11 +1863,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE return LavaridgeTown_EventScript_1A0190:: @ 81A0190 - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE return AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1894,30 +1894,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE - setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE .else - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE - setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1 - setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2 + setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2 .else - setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1 - setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2 + setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2 .endif return |