Skip to content

Commit

Permalink
Merge pull request #496 from ThibaultLassiaz/support-daycare-lg-eu-la…
Browse files Browse the repository at this point in the history
…ngages

Leaf Green : Support Daycare mode for EU languages
  • Loading branch information
hanzi authored Nov 11, 2024
2 parents 789de81 + 7663355 commit 5ff56b3
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 67 deletions.
135 changes: 72 additions & 63 deletions modules/data/symbols/patches/language/pokeleafgreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
#--------------------------------#
CB2_OVERWORLD:
D: 0x80565d4
F: ~
I: ~
F: 0x8056694
I: 0x80565c0
J: ~
S: ~
S: 0x80566a8
Task_YesNoMenu_HandleInput:
D: 0x809cf0c
F: ~
I: ~
F: 0x809cfcc
I: 0x809cef8
J: ~
S: ~
S: 0x809cfe0
Task_FlyIntoMap:
D: 0x8084330
F: ~
Expand All @@ -22,10 +22,10 @@ Task_FlyIntoMap:
S: ~
Task_ExitDoor:
D: 0x807def4
F: ~
I: ~
F: 0x807dfb4
I: 0x807dee0
J: ~
S: ~
S: 0x807dfc8
WaitForAorBPress:
D: 0x806b858
F: ~
Expand All @@ -45,34 +45,34 @@ EventScript_UseStrength:
#--------------------#
gMapGroups:
D: 0x83525ac
F: ~
I: ~
F: 0x834cad8
I: 0x834b768
J: ~
S: ~
S: 0x834de50
sMapNames:
D: 0x83f1340
F: ~
I: ~
F: 0x83ea0a0
I: 0x83e8da0
J: ~
S: ~
S: 0x83ebdb8
gWildMonHeaders:
D: 0x83c9940
F: ~
I: ~
F: 0x83c3e6c
I: 0x83c2afc
J: ~
S: ~
S: 0x83c51e4
gSaveBlock1Ptr:
D: 0x3004f58
F: ~
I: ~
F: 0x3004f58
I: 0x3004f58
J: ~
S: ~
S: 0x3004f58
gSaveBlock2Ptr:
D: 0x3004f5c
F: ~
I: ~
F: 0x3004f5c
I: 0x3004f5c
J: ~
S: ~
S: 0x3004f5c
CB2_RegionMap:
D: 0x80c0a58
F: ~
Expand Down Expand Up @@ -128,28 +128,28 @@ CB2_RETURNTOFIELDCONTINUESCRIPTPLAYMAPMUSIC:
S: ~
gMain:
D: 0x3003040
F: ~
I: ~
F: 0x3003040
I: 0x3003040
J: ~
S: ~
S: 0x3003040
gBattleMainFunc:
D: 0x3004ed4
F: ~
I: ~
F: 0x3004ed4
I: 0x3004ed4
J: ~
S: ~
S: 0x3004ed4
gBattlerControllerFuncs:
D: 0x3004f30
F: ~
I: ~
F: 0x3004f30
I: 0x3004f30
J: ~
S: ~
S: 0x3004f30
GTASKS:
D: 0x3004fe0
F: ~
I: ~
F: 0x3004fe0
I: 0x3004fe0
J: ~
S: ~
S: 0x3004fe0
BattleMainCB1:
D: 0x8012368
F: ~
Expand Down Expand Up @@ -282,22 +282,22 @@ gBattleWeather:
# Daycare Mode #
#----------------#
EventScript_EggHatch:
D: ~
F: ~
I: ~
D: 0x81c2fae
F: 0x81bdeed
I: 0x81bca9c
J: ~
S: ~
S: 0x81bf14b

# EggHatch party identification
gSpecialVar_0x8004:
J: ~

Task_Fanfare:
D: ~
F: ~
I: ~
D: 0x8071c20
F: 0x8079d44
I: 0x8071c0c
J: ~
S: ~
S: 0x8071cf4
#----------------#

#---------------------------#
Expand All @@ -311,16 +311,16 @@ Task_EndQuestLog:
S: ~
Task_DrawFieldMessageBox:
D: 0x8069360
F: ~
I: ~
F: 0x8069420
I: 0x806934c
J: ~
S: ~
S: 0x8069434
Task_MultichoiceMenu_HandleInput:
D: 0x809cd50
F: ~
I: ~
F: 0x809ce10
I: 0x809cd3c
J: ~
S: ~
S: 0x809ce24
gRngValue:
D: 0x3004f50
F: ~
Expand Down Expand Up @@ -502,23 +502,23 @@ Task_SlideSelectedSlotsOnscreen:
# PC Menu / Storage #
#-------------------------#
Task_PCMainMenu:
D: ~
F: ~
I: ~
D: 0x808c474
F: 0x808c534
I: 0x808c460
J: ~
S: ~
S: 0x808c548
Task_PokeStorageMain:
D: ~
F: ~
I: ~
D: 0x808d3a8
F: 0x808d468
I: 0x808d394
J: ~
S: ~
S: 0x808d47c
gPokemonStoragePtr:
D: ~
F: ~
I: ~
D: 0x3004f60
F: 0x3004f60
I: 0x3004f60
J: ~
S: ~
S: 0x3004f60
#-------------------------#

#--------------#
Expand Down Expand Up @@ -560,4 +560,13 @@ EventScript_FieldPoison:
I: ~
J: ~
S: ~
#---------------#
#---------------#

# Ununsed symbols that were conflicting with currently used symbols
# We set them to 0x0 to 'get them out of our way' and correctly target the desired symbol
EventScript_CutTree:
F: 0x0
CableClub_Text_YouMayBattleHere:
I: 0x0
Text_DontBeLikeThat:
S: 0x0
8 changes: 4 additions & 4 deletions wiki/pages/Mode - Daycare.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ not Shiny.
| :------- | :-----: | :---------: | :--------: | :--------: | :----------: |
| English ||||||
| Japanese ||||||
| German ||||| |
| Spanish ||||| |
| French ||||| |
| Italian ||||| |
| German ||||| |
| Spanish ||||| |
| French ||||| |
| Italian ||||| |

✅ Tested, working

Expand Down

0 comments on commit 5ff56b3

Please sign in to comment.