diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/daycare.s | 6 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 26 | ||||
| -rw-r--r-- | data/specials.inc | 12 | ||||
| -rw-r--r-- | data/trade.s | 6 |
4 files changed, 25 insertions, 25 deletions
diff --git a/data/daycare.s b/data/daycare.s index 483e94fae..44530acc9 100644 --- a/data/daycare.s +++ b/data/daycare.s @@ -9,13 +9,13 @@ .align 2 -gUnknown_0832B6C0:: @ 832B6C0 +sDaycareLevelMenuWindowTemplate:: @ 832B6C0 .incbin "baserom.gba", 0x32b6c0, 0x20 -gUnknown_0832B6E0:: @ 832B6E0 +sDaycareListMenuLevelTemplate:: @ 832B6E0 .incbin "baserom.gba", 0x32b6e0, 0x18 -gUnknown_0832B6F8:: @ 832B6F8 +sCompatibilityMessages:: @ 832B6F8 .incbin "baserom.gba", 0x32b6f8, 0x10 sJapaneseEggNickname:: @ 832B708 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 8c538f7aa..2084e995c 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,8 +1,8 @@ Route117_EventScript_291C18:: @ 8291C18 lock faceplayer - special sp0B5_daycare - specialvar VAR_RESULT, sp0B6_daycare + special GetDaycareMonNicknames + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 goto_eq Route117_EventScript_291C4D compare_var_to_value VAR_RESULT, 2 @@ -56,7 +56,7 @@ Route117_EventScript_291CC8:: @ 8291CC8 return Route117_EventScript_291CD1:: @ 8291CD1 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_292114, 4 setvar VAR_0x8004, 0 call Route117_EventScript_291CB7 @@ -64,9 +64,9 @@ Route117_EventScript_291CD1:: @ 8291CD1 end Route117_EventScript_291CE8:: @ 8291CE8 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_292299, 4 - special sp0B9_daycare_relationship_comment + special SetDaycareCompatibilityString special sub_8138AC0 waitmessage waitbuttonpress @@ -80,7 +80,7 @@ Route117_EventScript_291CE8:: @ 8291CE8 Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 lock faceplayer - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E0B compare_var_to_value VAR_RESULT, 2 @@ -103,21 +103,21 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 goto_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, 4 fadescreen 1 - special sub_8071330 + special ChooseSendDaycareMon waitstate compare_var_to_value VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, sub_80C70AC compare_var_to_value VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 - specialvar VAR_0x8005, sub_8070C58 + specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 msgbox Route117_PokemonDayCare_Text_292370, 4 waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat 47 - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DD4 release @@ -182,11 +182,11 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 goto_eq Route117_PokemonDayCare_EventScript_291F3D - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291EAC - special sub_80712C0 + special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 @@ -221,7 +221,7 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 playmoncry VAR_RESULT, 0 msgbox Route117_PokemonDayCare_Text_292593, 4 waitmoncry - specialvar VAR_RESULT, sp0B6_daycare + specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA @@ -278,7 +278,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C end Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 - special sub_80712C0 + special ShowDaycareLevelMenu waitstate compare_var_to_value VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA diff --git a/data/specials.inc b/data/specials.inc index 928de961b..5db6096ed 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -191,15 +191,15 @@ gSpecials:: @ 81DBA64 def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds def_special sub_8138B80 - def_special sp0B5_daycare - def_special sp0B6_daycare + def_special GetDaycareMonNicknames + def_special GetDaycareState def_special RejectEggFromDayCare def_special GiveEggFromDaycare - def_special sp0B9_daycare_relationship_comment - def_special sub_8070C58 + def_special SetDaycareCompatibilityString + def_special GetSelectedMonNickAndSpecies def_special StoreSelectedPokemonInDaycare - def_special sub_8071330 - def_special sub_80712C0 + def_special ChooseSendDaycareMon + def_special ShowDaycareLevelMenu def_special GetNumLevelsGainedFromDaycare def_special GetDaycareCost def_special TakePokemonFromDaycare diff --git a/data/trade.s b/data/trade.s index 601b597ed..f02c82351 100644 --- a/data/trade.s +++ b/data/trade.s @@ -19,13 +19,13 @@ gUnknown_0832D2BC:: @ 832D2BC gUnknown_0832DABC:: @ 832DABC .incbin "baserom.gba", 0x32dabc, 0xb -gUnknown_0832DAC7:: @ 832DAC7 +gText_MaleSymbol4:: @ 832DAC7 .incbin "baserom.gba", 0x32dac7, 0x2 -gUnknown_0832DAC9:: @ 832DAC9 +gText_FemaleSymbol4:: @ 832DAC9 .incbin "baserom.gba", 0x32dac9, 0x2 -gUnknown_0832DACB:: @ 832DACB +gText_GenderlessSymbol:: @ 832DACB .incbin "baserom.gba", 0x32dacb, 0x7 gUnknown_0832DAD2:: @ 832DAD2 |