diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
| commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
| tree | a4cfc7323151501d5603f1cd34e68a73f328434e /data/script_menu.s | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
Diffstat (limited to 'data/script_menu.s')
| -rw-r--r-- | data/script_menu.s | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/data/script_menu.s b/data/script_menu.s index 6cd7bf381..dbfb05621 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -578,7 +578,7 @@ gUnknown_0858B758:: @ 58B758 gUnknown_0858B760:: @ 858B760 - .4byte 0x0858abd8, 3 + .4byte gUnknown_0858ABD8, 3 .4byte gUnknown_0858B758, 1 .4byte gUnknown_0858ABF0, 3 .4byte gUnknown_0858AC08, 4 @@ -745,19 +745,36 @@ gUnknown_0858BB80:: @ 858BB80 .4byte gText_Exit gUnknown_0858BB9C:: @ 858BB9C - .incbin "baserom.gba", 0x58bb9c, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_277F1B + .4byte OldaleTown_PokemonCenter_2F_Text_277F5A + .4byte OldaleTown_PokemonCenter_2F_Text_277F96 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBAC:: @ 858BBAC - .incbin "baserom.gba", 0x58bbac, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_278831 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBBC:: @ 858BBBC - .incbin "baserom.gba", 0x58bbbc, 0x10 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_2787FC + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBCC:: @ 858BBCC - .incbin "baserom.gba", 0x58bbcc, 0x14 + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_278831 + .4byte OldaleTown_PokemonCenter_2F_Text_2787FC + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBE0:: @ 858BBE0 - .incbin "baserom.gba", 0x58bbe0, 0xc + .4byte OldaleTown_PokemonCenter_2F_Text_277F1B + .4byte OldaleTown_PokemonCenter_2F_Text_277F5A + .4byte OldaleTown_PokemonCenter_2F_Text_27889C gUnknown_0858BBEC:: @ 858BBEC - .incbin "baserom.gba", 0x58bbec, 0x18c + .4byte OldaleTown_PokemonCenter_2F_Text_27879F + .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 + .4byte OldaleTown_PokemonCenter_2F_Text_27889C |