diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-27 16:39:09 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-07-02 19:29:49 -0500 |
| commit | e3c0fb5a8577c780fee23fb21c1333c45cc37ebe (patch) | |
| tree | d5878c504c074d0c8c1ff64082980e0036a66169 | |
| parent | ec5f42fd36af2ac7a1bec4778b50f79851eb8a8a (diff) | |
Fix building German Debug
| -rwxr-xr-x | asmdiff_de_debug.sh | 2 | ||||
| -rw-r--r-- | src/roulette.c | 5 | ||||
| -rw-r--r-- | src/roulette_gfx.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/asmdiff_de_debug.sh b/asmdiff_de_debug.sh index 837b88cd2..131e6b232 100755 --- a/asmdiff_de_debug.sh +++ b/asmdiff_de_debug.sh @@ -4,4 +4,4 @@ OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" $OBJDUMP $OPTIONS baserom_de_debug.gba > baserom_de_debug.dump $OBJDUMP $OPTIONS pokeruby_de_debug.gba > pokeruby_de_debug.dump -diff baserom_de_debug.dump pokeruby_de_debug.dump +diff -u baserom_de_debug.dump pokeruby_de_debug.dump diff --git a/src/roulette.c b/src/roulette.c index 38ba26b84..79ef4f10e 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -33,8 +33,6 @@ asm(".include \"constants/gba_constants.inc\""); void *gUnknown_Debug_03005FB8; #endif -#define static - void sub_81150FC(void); void sub_8115124(void); void sub_8115238(void); @@ -1701,10 +1699,9 @@ void debug_sub_812CDE4(u8 taskId) } } -const u8 gUnknown_Debug_0842510D[] = _("Set COIN and Press START\nAーp1 Bーm1 R:Lー×10"); - void debug_sub_812CFE8(u8 taskId) { + static const u8 gUnknown_Debug_0842510D[] = _("Set COIN and Press START\nAーp1 Bーm1 R:Lー×10"); gTasks[taskId].data[13] = gSaveBlock1.coins; if (Random() & 1) gSpecialVar_0x8004 |= 0x80; diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index fff82af2e..006eb70a0 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -1410,7 +1410,7 @@ void debug_sub_812E698(struct Sprite *sprite) } else { - eRoulette->var8C = gUnknown_083F8DF4[eRoulette->var04_0].var1C * 2; + eRoulette->var8C = ({float f = gUnknown_083F8DF4[eRoulette->var04_0].var1C; f * 2;}); eRoulette->var7F = eRoulette->var7E; } sprite->data[0] = 1; |