diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-10 03:20:02 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-10 03:20:02 -0400 |
| commit | 10f798323e88e4cdf8fe881956dd5ad41121e1a3 (patch) | |
| tree | 3871c3b6abb80424dc77870f1e1ad7ce38a3afe2 /data | |
| parent | 16fd2ca3856668cd4e7cb5e94d3022ac5edce8a3 (diff) | |
| parent | fe13cf593a7c14480de940e413177586cc8eae2e (diff) | |
finish decompiling player_pc.c
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/maps/SlateportCity.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 8 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 19f9af2eb..6125c4871 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, 118 - setvar 0x4011, 117 + setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0bfeb4f5a..e84f8ccc6 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, 118 - setvar 0x4011, 117 + setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/specials.inc b/data/specials.inc index bac45b91b..dd12775f5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -187,7 +187,7 @@ gSpecials:: .4byte sp0B8_daycare .4byte sp0B9_daycare_relationship_comment .4byte sub_8042328 - .4byte daycare_send + .4byte Daycare_SendPokemon_Special .4byte ChooseSendDaycareMon .4byte ShowDaycareLevelMenu .4byte sub_80417B8 |