diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/cinnabargym.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/CinnabarGym.asm (renamed from scripts/cinnabargym.asm) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/cinnabargym.asm b/scripts/CinnabarGym.asm index e2de3f6d..2dc07e58 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/CinnabarGym.asm @@ -1,9 +1,9 @@ -CinnabarGymScript: +CinnabarGym_Script: call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing - ld hl, CinnabarGymScriptPointers + ld hl, CinnabarGym_ScriptPointers ld a, [wCinnabarGymCurScript] - jp JumpTable + jp CallFunctionInTable CinnabarGymScript_75759: ld hl, wCurrentMapScriptFlags @@ -43,7 +43,7 @@ CinnabarGymScript_74f48: CinnabarGymFlagAction: predef_jump FlagActionPredef -CinnabarGymScriptPointers: +CinnabarGym_ScriptPointers: dw CinnabarGymScript0 dw CinnabarGymScript1 dw CinnabarGymScript2 @@ -230,7 +230,7 @@ CinnabarGymScript3_75857: jp CinnabarGymScript_75792 -CinnabarGymTextPointers: +CinnabarGym_TextPointers: dw CinnabarGymText1 dw CinnabarGymText2 dw CinnabarGymText3 @@ -293,8 +293,8 @@ BlaineBattleText: BlaineEndBattleText: TX_FAR _BlaineEndBattleText - db $11 - db $d + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_WAIT db "@" BlaineFireBlastText: @@ -307,7 +307,7 @@ BlaineBadgeText: ReceivedTM38Text: TX_FAR _ReceivedTM38Text - db $0B + TX_SFX_ITEM_1 TX_FAR _TM38ExplanationText db "@" |