From ed142f69171f575e9359e113cd18f315cb0fcdd3 Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 8 Jun 2023 02:18:40 +0100 Subject: [PATCH 1/2] kill THUMB_FUNC and ARM_FUNC + scrcmd --- arm7/asm/wram2.s | 4 +- arm7/global.inc | 2 +- arm7/lib/include/SND_alarm.h | 1 - arm7/lib/src/MI_dma.c | 6 +- arm7/lib/src/MI_memory.c | 2 +- arm7/lib/src/MI_swap.c | 1 + arm7/lib/src/OS_alloc.c | 20 +- arm7/lib/src/OS_arena.c | 16 +- arm7/lib/src/OS_context.c | 8 +- arm7/lib/src/OS_init.c | 3 +- arm7/lib/src/OS_interrupt.c | 16 +- arm7/lib/src/OS_irqTable.c | 24 +- arm7/lib/src/OS_message.c | 10 +- arm7/lib/src/OS_mutex.c | 14 +- arm7/lib/src/OS_reset.c | 16 +- arm7/lib/src/OS_spinLock.c | 30 +- arm7/lib/src/OS_system.c | 16 +- arm7/lib/src/OS_terminate_proc.c | 6 +- arm7/lib/src/OS_thread.c | 58 +-- arm7/lib/src/OS_tick.c | 10 +- arm7/lib/src/OS_timer.c | 4 +- arm7/lib/src/PAD_xyButton.c | 4 +- arm7/lib/src/SND_alarm.c | 1 + arm7/lib/src/SND_bank.c | 1 + arm7/lib/src/SND_capture.c | 1 + arm7/lib/src/SND_channel.c | 1 + arm7/lib/src/SND_command.c | 2 + arm7/lib/src/SND_exChannel.c | 1 + arm7/lib/src/SND_global.c | 1 + arm7/lib/src/SND_main.c | 5 +- arm7/lib/src/SND_seq.c | 1 + arm7/lib/src/SND_util.c | 1 + arm7/lib/src/SND_work.c | 1 + arm9/asm/scrcmd_asm.s | 119 ------ arm9/lib/NitroSDK/include/MI_swap.h | 2 + arm9/lib/NitroSDK/include/SND_alarm.h | 2 +- arm9/lib/NitroSDK/include/SND_bank.h | 3 +- arm9/lib/NitroSDK/include/SND_interface.h | 2 +- arm9/lib/NitroSDK/include/SND_main.h | 2 +- arm9/lib/NitroSDK/include/SND_util.h | 2 +- arm9/lib/NitroSDK/include/SND_work.h | 2 +- .../NitroSDK/include}/WIFI_stubsmd5_dummy.h | 6 +- arm9/lib/NitroSDK/src/CARD_backup.c | 17 +- arm9/lib/NitroSDK/src/CARD_common.c | 30 +- arm9/lib/NitroSDK/src/CARD_pullOut.c | 14 +- arm9/lib/NitroSDK/src/CARD_request.c | 8 +- arm9/lib/NitroSDK/src/CARD_rom.c | 26 +- arm9/lib/NitroSDK/src/CARD_spi.c | 4 +- arm9/lib/NitroSDK/src/CP_context.c | 6 +- arm9/lib/NitroSDK/src/CTRDG_backup.c | 4 +- arm9/lib/NitroSDK/src/CTRDG_common.c | 50 +-- arm9/lib/NitroSDK/src/CTRDG_flash_AT29LV512.c | 98 ++--- arm9/lib/NitroSDK/src/FS_archive.c | 41 +- arm9/lib/NitroSDK/src/FS_command.c | 5 +- arm9/lib/NitroSDK/src/FS_command_default.c | 25 +- arm9/lib/NitroSDK/src/FS_file.c | 29 +- arm9/lib/NitroSDK/src/FS_overlay.c | 27 +- arm9/lib/NitroSDK/src/FS_rom.c | 19 +- arm9/lib/NitroSDK/src/FX.c | 7 +- arm9/lib/NitroSDK/src/FX_atan.c | 7 +- arm9/lib/NitroSDK/src/FX_cp.c | 23 +- arm9/lib/NitroSDK/src/FX_mtx22.c | 11 +- arm9/lib/NitroSDK/src/FX_mtx33.c | 19 +- arm9/lib/NitroSDK/src/FX_mtx43.c | 24 +- arm9/lib/NitroSDK/src/FX_mtx44.c | 20 +- arm9/lib/NitroSDK/src/FX_sincos.c | 2 +- arm9/lib/NitroSDK/src/FX_vec.c | 24 +- arm9/lib/NitroSDK/src/GX.c | 19 +- arm9/lib/NitroSDK/src/GX_asm.c | 5 +- arm9/lib/NitroSDK/src/GX_bgcnt.c | 36 +- arm9/lib/NitroSDK/src/GX_g2.c | 13 +- arm9/lib/NitroSDK/src/GX_g3.c | 8 +- arm9/lib/NitroSDK/src/GX_g3_util.c | 17 +- arm9/lib/NitroSDK/src/GX_g3b.c | 32 +- arm9/lib/NitroSDK/src/GX_g3imm.c | 9 +- arm9/lib/NitroSDK/src/GX_g3x.c | 37 +- arm9/lib/NitroSDK/src/GX_load2d.c | 75 ++-- arm9/lib/NitroSDK/src/GX_load3d.c | 24 +- arm9/lib/NitroSDK/src/GX_state.c | 5 +- arm9/lib/NitroSDK/src/GX_vramcnt.c | 105 ++--- arm9/lib/NitroSDK/src/MATH_crc.c | 27 +- arm9/lib/NitroSDK/src/MATH_dgt.c | 7 +- arm9/lib/NitroSDK/src/MATH_pop.c | 5 +- arm9/lib/NitroSDK/src/MI_dma.c | 28 +- arm9/lib/NitroSDK/src/MI_dma_card.c | 4 +- arm9/lib/NitroSDK/src/MI_dma_gxcommand.c | 14 +- arm9/lib/NitroSDK/src/MI_dma_hblank.c | 6 +- arm9/lib/NitroSDK/src/MI_init.c | 4 +- arm9/lib/NitroSDK/src/MI_memory.c | 32 +- arm9/lib/NitroSDK/src/MI_swap.c | 7 +- arm9/lib/NitroSDK/src/MI_uncompress.c | 4 +- arm9/lib/NitroSDK/src/MI_wram.c | 5 +- arm9/lib/NitroSDK/src/OS_alarm.c | 20 +- arm9/lib/NitroSDK/src/OS_alloc.c | 15 +- arm9/lib/NitroSDK/src/OS_arena.c | 23 +- arm9/lib/NitroSDK/src/OS_cache.c | 20 +- arm9/lib/NitroSDK/src/OS_context.c | 8 +- arm9/lib/NitroSDK/src/OS_emulator.c | 10 +- arm9/lib/NitroSDK/src/OS_entropy.c | 10 +- arm9/lib/NitroSDK/src/OS_exception.c | 14 +- arm9/lib/NitroSDK/src/OS_init.c | 4 +- arm9/lib/NitroSDK/src/OS_interrupt.c | 23 +- arm9/lib/NitroSDK/src/OS_irqHandler.c | 8 +- arm9/lib/NitroSDK/src/OS_irqTable.c | 22 +- arm9/lib/NitroSDK/src/OS_message.c | 12 +- arm9/lib/NitroSDK/src/OS_mutex.c | 16 +- arm9/lib/NitroSDK/src/OS_ownerInfo.c | 9 +- arm9/lib/NitroSDK/src/OS_printf.c | 17 +- arm9/lib/NitroSDK/src/OS_protectionRegion.c | 8 +- arm9/lib/NitroSDK/src/OS_protectionUnit.c | 6 +- arm9/lib/NitroSDK/src/OS_reset.c | 21 +- arm9/lib/NitroSDK/src/OS_spinLock.c | 44 +-- arm9/lib/NitroSDK/src/OS_system.c | 19 +- arm9/lib/NitroSDK/src/OS_tcm.c | 3 +- arm9/lib/NitroSDK/src/OS_terminate_proc.c | 6 +- arm9/lib/NitroSDK/src/OS_thread.c | 71 ++-- arm9/lib/NitroSDK/src/OS_tick.c | 12 +- arm9/lib/NitroSDK/src/OS_timer.c | 3 +- arm9/lib/NitroSDK/src/OS_valarm.c | 4 +- arm9/lib/NitroSDK/src/OS_vramExclusive.c | 10 +- arm9/lib/NitroSDK/src/PXI_fifo.c | 12 +- arm9/lib/NitroSDK/src/PXI_init.c | 4 +- arm9/lib/NitroSDK/src/RTC_convert.c | 3 +- arm9/lib/NitroSDK/src/RTC_internal.c | 12 +- arm9/lib/NitroSDK/src/SND_alarm.c | 10 +- arm9/lib/NitroSDK/src/SND_bank.c | 20 +- arm9/lib/NitroSDK/src/SND_command.c | 33 +- arm9/lib/NitroSDK/src/SND_interface.c | 84 ++-- arm9/lib/NitroSDK/src/SND_main.c | 9 +- arm9/lib/NitroSDK/src/SND_util.c | 4 +- arm9/lib/NitroSDK/src/SND_work.c | 6 +- arm9/lib/NitroSDK/src/WIFI_stubsmd5_dummy.c | 17 + arm9/lib/NitroSDK/src/WM_ks.c | 6 +- arm9/lib/NitroSDK/src/crt0.c | 17 +- arm9/lib/NitroSDK/src/custom_allocator.c | 9 +- arm9/lib/libc/src/MSL_Common_arith.c | 5 +- arm9/lib/libc/src/MSL_Common_rand.c | 6 +- arm9/lib/libnns/src/NNS_FND_allocator.c | 11 +- arm9/lib/libnns/src/NNS_FND_expheap.c | 29 +- arm9/lib/libnns/src/NNS_FND_heapcommon.c | 11 +- arm9/lib/libnns/src/NNS_FND_list.c | 17 +- arm9/modules/01/src/module_01.c | 1 - arm9/modules/05/src/mod05_021E72FC.c | 12 +- arm9/modules/11/src/mod11_0222D5C0_2.c | 2 +- arm9/modules/19/src/module_19.c | 6 +- arm9/modules/21/src/mod21_02254854.c | 22 +- arm9/modules/21/src/mod21_02254A6C.c | 24 +- arm9/modules/22/src/module_22_sinit.c | 2 +- arm9/modules/23/src/module_23_sinit.c | 2 +- arm9/modules/24/src/module_24_sinit.c | 2 +- arm9/modules/25/src/module_25_sinit.c | 2 +- arm9/modules/26/src/module_26_sinit.c | 2 +- arm9/modules/27/src/module_27_sinit.c | 2 +- arm9/modules/28/src/module_28_sinit.c | 2 +- arm9/modules/29/src/module_29_sinit.c | 2 +- arm9/modules/30/src/module_30_sinit.c | 2 +- arm9/modules/31/src/module_31_sinit.c | 2 +- arm9/modules/32/src/module_32_sinit.c | 2 +- arm9/modules/33/src/module_33_sinit.c | 2 +- arm9/modules/34/src/module_34_sinit.c | 2 +- arm9/modules/35/src/module_35_sinit.c | 2 +- arm9/modules/36/src/module_36_sinit.c | 2 +- arm9/modules/37/src/module_37_sinit.c | 2 +- arm9/modules/38/src/module_38_sinit.c | 2 +- arm9/modules/39/src/module_39_sinit.c | 2 +- arm9/modules/40/src/module_40_sinit.c | 2 +- arm9/modules/41/src/module_41_sinit.c | 2 +- arm9/modules/42/src/module_42_sinit.c | 2 +- arm9/modules/43/src/module_43_sinit.c | 2 +- arm9/modules/44/src/module_44_sinit.c | 2 +- arm9/modules/45/src/module_45_sinit.c | 2 +- arm9/modules/46/src/module_46_sinit.c | 2 +- arm9/modules/47/src/module_47_sinit.c | 2 +- arm9/modules/48/src/module_48_sinit.c | 2 +- arm9/modules/49/src/module_49_sinit.c | 2 +- arm9/modules/50/src/module_50_sinit.c | 2 +- arm9/modules/52/src/module_52.c | 25 +- arm9/modules/59/src/mod59_Intro.c | 70 ++-- arm9/modules/59/src/mod59_TV.c | 22 +- arm9/modules/62/src/module_62_sinit.c | 2 +- arm9/modules/63/src/mod63_021DB450.c | 32 +- arm9/src/GX_layers.c | 19 +- arm9/src/WIFI_stubsmd5_dummy.c | 17 - arm9/src/bag.c | 2 - arm9/src/bag_view.c | 40 +- arm9/src/bg_window.c | 222 +++++------ arm9/src/brightness.c | 16 +- arm9/src/camera.c | 70 ++-- arm9/src/coins.c | 2 - arm9/src/communication_error.c | 4 +- arm9/src/daycare.c | 2 - arm9/src/error_handling.c | 2 +- arm9/src/error_message_reset.c | 5 +- arm9/src/event_data.c | 2 - arm9/src/filesystem.c | 34 +- arm9/src/font.c | 34 +- arm9/src/game_init.c | 2 - arm9/src/gf_gfx_loader.c | 32 +- arm9/src/gf_rtc.c | 28 +- arm9/src/hall_of_fame.c | 2 - arm9/src/heap.c | 25 +- arm9/src/igt.c | 2 - arm9/src/itemtool.c | 2 - arm9/src/list_menu.c | 46 +-- arm9/src/list_menu_items.c | 14 +- arm9/src/mail.c | 2 - arm9/src/mail_message.c | 2 - arm9/src/main.c | 22 +- arm9/src/map_header.c | 2 - arm9/src/map_matrix.c | 36 +- arm9/src/math_util.c | 62 +-- arm9/src/message_format.c | 2 - arm9/src/msgdata.c | 2 - arm9/src/nutdata.c | 2 - arm9/src/oam.c | 24 +- arm9/src/options.c | 2 - arm9/src/overlay_manager.c | 14 +- arm9/src/palette.c | 70 ++-- arm9/src/party.c | 2 - arm9/src/play_timer.c | 7 +- arm9/src/player_data.c | 2 - arm9/src/poke_overlay.c | 20 +- arm9/src/pokedex.c | 2 - arm9/src/pokemon.c | 3 - arm9/src/pokemon_storage_system.c | 2 - arm9/src/poketch.c | 2 - arm9/src/render_text.c | 32 +- arm9/src/render_window.c | 80 ++-- arm9/src/rs_migrate_string.c | 6 +- arm9/src/sav_chatot.c | 20 +- arm9/src/sav_system_info.c | 2 - arm9/src/save.c | 2 - arm9/src/save_data_read_error.c | 4 +- arm9/src/save_data_write_error.c | 2 +- arm9/src/scrcmd.c | 370 ++++++++++-------- arm9/src/scrcmd_13.c | 9 +- arm9/src/scrcmd_25.c | 9 +- arm9/src/scrcmd_amity_square.c | 7 +- arm9/src/scrcmd_berry_trees.c | 19 +- arm9/src/scrcmd_coins.c | 21 +- arm9/src/scrcmd_daycare.c | 33 +- arm9/src/scrcmd_flags.c | 41 +- arm9/src/scrcmd_fossils.c | 11 +- arm9/src/scrcmd_items.c | 17 +- arm9/src/scrcmd_mart.c | 10 +- arm9/src/scrcmd_money.c | 17 +- arm9/src/scrcmd_move_relearner.c | 23 +- arm9/src/scrcmd_names.c | 85 ++-- arm9/src/scrcmd_party.c | 75 ++-- arm9/src/scrcmd_prizes.c | 3 +- arm9/src/scrcmd_sound.c | 55 +-- arm9/src/scrcmd_underground.c | 33 +- arm9/src/scrcmd_union.c | 3 +- arm9/src/script.c | 27 +- arm9/src/script_pokemon_util.c | 2 - arm9/src/seal_case.c | 2 - arm9/src/sound.c | 2 - arm9/src/sound_chatot.c | 22 +- arm9/src/string_control_code.c | 2 - arm9/src/string_util.c | 17 +- arm9/src/task.c | 2 - arm9/src/text.c | 39 +- arm9/src/text_02054590.c | 19 +- arm9/src/timer3.c | 13 +- arm9/src/trainer_data.c | 3 - arm9/src/unk_020040F4.c | 162 ++++---- arm9/src/unk_020051F4.c | 74 ++-- arm9/src/unk_020061E8.c | 4 +- arm9/src/unk_02006D98.c | 80 ++-- arm9/src/unk_02008AA4.c | 16 +- arm9/src/unk_02008DEC.c | 164 ++++---- arm9/src/unk_0200BA78.c | 4 +- arm9/src/unk_0200BB14.c | 198 +++++----- arm9/src/unk_0200CA44.c | 10 +- arm9/src/unk_020139D8.c | 2 - arm9/src/unk_02015CC0.c | 2 - arm9/src/unk_0201C6B4.c | 10 +- arm9/src/unk_0201CBEC.c | 2 +- arm9/src/unk_02021590.c | 38 +- arm9/src/unk_02021934.c | 2 - arm9/src/unk_02021FF8.c | 2 - arm9/src/unk_020222E8.c | 12 +- arm9/src/unk_02022450.c | 4 +- arm9/src/unk_02022504.c | 12 +- arm9/src/unk_02024E64.c | 21 +- arm9/src/unk_02025484.c | 8 +- arm9/src/unk_020254B8.c | 2 - arm9/src/unk_020286F8.c | 2 - arm9/src/unk_02029FB0.c | 30 +- arm9/src/unk_0202A1E0.c | 82 ++-- arm9/src/unk_0202A8F4.c | 6 +- arm9/src/unk_0202ABBC.c | 20 +- arm9/src/unk_0202C0E0.c | 8 +- arm9/src/unk_0202C144.c | 2 - arm9/src/unk_0202D858.c | 7 +- arm9/src/unk_0202E29C.c | 122 +++--- arm9/src/unk_0202F150.c | 187 ++++----- arm9/src/unk_02031480.c | 41 +- arm9/src/unk_02031734.c | 314 +++++++-------- arm9/src/unk_02033778.c | 4 +- arm9/src/unk_020337E8.c | 9 +- arm9/src/unk_0204AEA8.c | 4 +- arm9/src/unk_0204AF24.c | 22 +- arm9/src/unk_0204B0A0.c | 30 +- arm9/src/unk_0205EC84.c | 110 +++--- arm9/src/unk_0205FA2C.c | 43 +- arm9/src/unk_0206015C.c | 5 +- arm9/src/unk_0206439C.c | 2 +- arm9/src/unk_02064E20.c | 2 +- arm9/src/unk_02064E4C.c | 3 - arm9/src/unk_0206B688.c | 2 - arm9/src/unk_0206BB28.c | 2 - arm9/src/unk_0207FC5C.c | 2 - arm9/src/unk_020851B8.c | 12 +- arm9/src/unk_02085338.c | 44 +-- arm9/src/unk_02087A1C.c | 2 - arm9/src/unk_0208890C.c | 6 +- arm9/src/unk_02088AAC.c | 16 +- arm9/src/unk_02088DD8.c | 8 +- arm9/src/unk_0208A300.c | 12 +- arm9/src/use_item_on_mon.c | 2 - arm9/src/waza.c | 4 +- arm9/src/wfc_user_info_warning.c | 2 +- include-mw/code16.h | 1 + include-mw/code32.h | 1 + include-mw/function_target.h | 3 - include/global.h | 2 + include/scrcmd.h | 8 +- 328 files changed, 3277 insertions(+), 3315 deletions(-) rename {include => arm9/lib/NitroSDK/include}/WIFI_stubsmd5_dummy.h (61%) create mode 100644 arm9/lib/NitroSDK/src/WIFI_stubsmd5_dummy.c delete mode 100644 arm9/src/WIFI_stubsmd5_dummy.c create mode 100644 include-mw/code16.h create mode 100644 include-mw/code32.h diff --git a/arm7/asm/wram2.s b/arm7/asm/wram2.s index 6dfeea6f3..030c46e4b 100644 --- a/arm7/asm/wram2.s +++ b/arm7/asm/wram2.s @@ -1274,8 +1274,8 @@ _038073E0: .word 0x0380FFFC _038073E4: .word 0x04000180 _038073E8: .word 0x027FFE00 - arm_func_start FUN_038073EC -FUN_038073EC: ;@ 0x038073EC + arm_func_start OSi_DoResetSystem +OSi_DoResetSystem: ;@ 0x038073EC mov r1, #0 ldr r0, _03807400 ;@ =0x04000208 strh r1, [r0] diff --git a/arm7/global.inc b/arm7/global.inc index 71ae9d3f7..758eb0062 100644 --- a/arm7/global.inc +++ b/arm7/global.inc @@ -280,7 +280,7 @@ .extern RTC_WriteTime .extern WVR_Shutdown .extern WVR_Init -.extern FUN_038073EC +.extern OSi_DoResetSystem .extern WMSP_GetAllowedChannel .extern OS_DisableIrqMask .extern OS_EnableIrqMask diff --git a/arm7/lib/include/SND_alarm.h b/arm7/lib/include/SND_alarm.h index 51f01bccf..3af4103d7 100644 --- a/arm7/lib/include/SND_alarm.h +++ b/arm7/lib/include/SND_alarm.h @@ -1,7 +1,6 @@ #ifndef GUARD_SND_ALARM_H #define GUARD_SND_ALARM_H -#include "global.h" #include "nitro/SND_alarm_shared.h" void SND_AlarmInit(void); diff --git a/arm7/lib/src/MI_dma.c b/arm7/lib/src/MI_dma.c index fc2ff0c9a..4cce3a450 100644 --- a/arm7/lib/src/MI_dma.c +++ b/arm7/lib/src/MI_dma.c @@ -1,8 +1,8 @@ -#include "function_target.h" #include "MI_dma.h" #include "OS_system.h" +#include "code32.h" -ARM_FUNC void MI_WaitDma(u32 channel) { +void MI_WaitDma(u32 channel) { OSIntrMode mode = OS_DisableInterrupts(); vu32 * addr = (vu32 *)(REG_ADDR_DMA0SAD + (channel * 3 + 2) * 4); while(addr[0] & 0x80000000) ; @@ -15,7 +15,7 @@ ARM_FUNC void MI_WaitDma(u32 channel) { mode = OS_RestoreInterrupts(mode); } -ARM_FUNC void MI_StopDma(u32 channel) { +void MI_StopDma(u32 channel) { OSIntrMode mode = OS_DisableInterrupts(); vu16 * addr = (vu16 *)(REG_ADDR_DMA0SAD + (channel * 6 + 5) * 2); addr[0] &= ~(DMA_START_MASK | DMA_REPEAT); diff --git a/arm7/lib/src/MI_memory.c b/arm7/lib/src/MI_memory.c index acb982a4e..32e5ad013 100644 --- a/arm7/lib/src/MI_memory.c +++ b/arm7/lib/src/MI_memory.c @@ -1,5 +1,5 @@ -#include "function_target.h" #include "MI_memory.h" +#include "code32.h" asm void MIi_CpuClear16(register u16 value, register u16 * dst, register u32 size) { mov r3, #0 diff --git a/arm7/lib/src/MI_swap.c b/arm7/lib/src/MI_swap.c index 71e523f80..96b899ce0 100644 --- a/arm7/lib/src/MI_swap.c +++ b/arm7/lib/src/MI_swap.c @@ -1,4 +1,5 @@ #include "MI_swap.h" +#include "code32.h" asm u32 MI_SwapWord(register u32 data, register u32 * dst) { swp r0, r0, [r1] diff --git a/arm7/lib/src/OS_alloc.c b/arm7/lib/src/OS_alloc.c index 7ea117237..5451597b0 100644 --- a/arm7/lib/src/OS_alloc.c +++ b/arm7/lib/src/OS_alloc.c @@ -1,11 +1,11 @@ -#include "function_target.h" #include "consts.h" #include "OS_alloc.h" #include "OS_system.h" +#include "code32.h" void* OSiHeapInfo[OS_ARENA_MAX]; -ARM_FUNC Cell* DLAddFront(Cell* list, Cell* cell) +Cell* DLAddFront(Cell* list, Cell* cell) { cell->next = list; cell->prev = NULL; @@ -15,7 +15,7 @@ ARM_FUNC Cell* DLAddFront(Cell* list, Cell* cell) return cell; } -ARM_FUNC Cell* DLExtract(Cell* list, Cell* cell) +Cell* DLExtract(Cell* list, Cell* cell) { if (cell->next) { cell->next->prev = cell->prev; @@ -28,7 +28,7 @@ ARM_FUNC Cell* DLExtract(Cell* list, Cell* cell) return list; } -ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted) +Cell *DLInsert(Cell *original, Cell *inserted) { Cell *prevCell; Cell *nextCell; @@ -78,7 +78,7 @@ ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted) #define HEADERSIZE OSi_ROUND(sizeof(Cell), 32) #define MINOBJSIZE (HEADERSIZE+32) -ARM_FUNC void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) +void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) { OSHeapInfo* heapInfo; HeapDesc* hd; @@ -142,7 +142,7 @@ ARM_FUNC void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) return (void *)((char *)cell + HEADERSIZE); } -ARM_FUNC void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr) +void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr) { OSHeapInfo *heapInfo; HeapDesc *hd; @@ -164,7 +164,7 @@ ARM_FUNC void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC OSHeapHandle OS_SetCurrentHeap(OSArenaId id, OSHeapHandle heap) +OSHeapHandle OS_SetCurrentHeap(OSArenaId id, OSHeapHandle heap) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -176,7 +176,7 @@ ARM_FUNC OSHeapHandle OS_SetCurrentHeap(OSArenaId id, OSHeapHandle heap) return prev; } -ARM_FUNC void *OS_InitAlloc(OSArenaId id, void *arenaStart, void *arenaEnd, s32 maxHeaps) +void *OS_InitAlloc(OSArenaId id, void *arenaStart, void *arenaEnd, s32 maxHeaps) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -207,7 +207,7 @@ ARM_FUNC void *OS_InitAlloc(OSArenaId id, void *arenaStart, void *arenaEnd, s32 return heapInfo->arenaStart; } -ARM_FUNC OSHeapHandle OS_CreateHeap(OSArenaId id, void *start, void *end) +OSHeapHandle OS_CreateHeap(OSArenaId id, void *start, void *end) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -250,7 +250,7 @@ ARM_FUNC OSHeapHandle OS_CreateHeap(OSArenaId id, void *start, void *end) } \ } while (0) -ARM_FUNC s32 OS_CheckHeap(OSArenaId id, OSHeapHandle heap) +s32 OS_CheckHeap(OSArenaId id, OSHeapHandle heap) { OSHeapInfo *heapInfo; HeapDesc *hd; diff --git a/arm7/lib/src/OS_arena.c b/arm7/lib/src/OS_arena.c index 516fc10bd..9f6d39f1c 100644 --- a/arm7/lib/src/OS_arena.c +++ b/arm7/lib/src/OS_arena.c @@ -1,6 +1,6 @@ -#include "function_target.h" #include "consts.h" #include "OS_arena.h" +#include "code32.h" static BOOL OSi_Initialized = FALSE; @@ -9,7 +9,7 @@ extern void SDK_WRAM_ARENA_LO(void); extern void SDK_IRQ_STACKSIZE(void); extern void SDK_SYS_STACKSIZE(void); -ARM_FUNC void OS_InitArena(void) +void OS_InitArena(void) { if (OSi_Initialized) { @@ -27,17 +27,17 @@ ARM_FUNC void OS_InitArena(void) OS_SetArenaLo(OS_ARENA_WRAM_SUBPRIV, OS_GetInitArenaLo(OS_ARENA_WRAM_SUBPRIV)); } -ARM_FUNC void* OS_GetArenaHi(OSArenaId id) +void* OS_GetArenaHi(OSArenaId id) { return OSi_GetArenaInfo().hi[id]; } -ARM_FUNC void* OS_GetArenaLo(OSArenaId id) +void* OS_GetArenaLo(OSArenaId id) { return OSi_GetArenaInfo().lo[id]; } -ARM_FUNC void* OS_GetInitArenaHi(OSArenaId id) +void* OS_GetInitArenaHi(OSArenaId id) { switch (id) { case OS_ARENA_MAIN_SUBPRIV: @@ -74,7 +74,7 @@ ARM_FUNC void* OS_GetInitArenaHi(OSArenaId id) } } -ARM_FUNC void* OS_GetInitArenaLo(OSArenaId id) { +void* OS_GetInitArenaLo(OSArenaId id) { switch (id) { case OS_ARENA_MAIN_SUBPRIV: return (void *)((u32)0x027fafcc); //todo SDK_SUBPRIV_ARENA_LO @@ -101,10 +101,10 @@ ARM_FUNC void* OS_GetInitArenaLo(OSArenaId id) { } } -ARM_FUNC void OS_SetArenaHi(OSArenaId id, void* newHi) { +void OS_SetArenaHi(OSArenaId id, void* newHi) { OSi_GetArenaInfo().hi[id] = newHi; } -ARM_FUNC void OS_SetArenaLo(OSArenaId id, void* newLo) { +void OS_SetArenaLo(OSArenaId id, void* newLo) { OSi_GetArenaInfo().lo[id] = newLo; } diff --git a/arm7/lib/src/OS_context.c b/arm7/lib/src/OS_context.c index 99a25bb12..38cfa3e64 100644 --- a/arm7/lib/src/OS_context.c +++ b/arm7/lib/src/OS_context.c @@ -1,8 +1,8 @@ #include "OS_context.h" #include "consts.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC asm void OS_InitContext(register OSContext *context, register u32 newpc, register u32 newsp) +asm void OS_InitContext(register OSContext *context, register u32 newpc, register u32 newsp) { add newpc, newpc, #4 str newpc, [context, #0x40] @@ -38,7 +38,7 @@ ARM_FUNC asm void OS_InitContext(register OSContext *context, register u32 newpc bx lr } -ARM_FUNC asm BOOL OS_SaveContext(register OSContext *context) +asm BOOL OS_SaveContext(register OSContext *context) { add r1, r0, #0 @@ -59,7 +59,7 @@ ARM_FUNC asm BOOL OS_SaveContext(register OSContext *context) bx lr } -ARM_FUNC asm void OS_LoadContext(register OSContext* context) +asm void OS_LoadContext(register OSContext* context) { mrs r1, cpsr bic r1, r1, #HW_PSR_CPU_MODE_MASK diff --git a/arm7/lib/src/OS_init.c b/arm7/lib/src/OS_init.c index d465aa9a4..5717c19cd 100644 --- a/arm7/lib/src/OS_init.c +++ b/arm7/lib/src/OS_init.c @@ -1,12 +1,13 @@ #include "function_target.h" #include "OS_init.h" +#include "code32.h" extern void PXI_Init(void); extern void OS_InitThread(void); extern void OS_InitAlarm(void); extern void CTRDG_Init(void); -ARM_FUNC void OS_Init(void) +void OS_Init(void) { OS_InitArena(); PXI_Init(); diff --git a/arm7/lib/src/OS_interrupt.c b/arm7/lib/src/OS_interrupt.c index e9fc33473..dc36740af 100644 --- a/arm7/lib/src/OS_interrupt.c +++ b/arm7/lib/src/OS_interrupt.c @@ -1,18 +1,18 @@ -#include "function_target.h" #include "consts.h" #include "OS_interrupt.h" #include "OS_thread.h" +#include "code32.h" extern OSThreadQueue OSi_IrqThreadQueue; -ARM_FUNC void OS_InitIrqTable(void) +void OS_InitIrqTable(void) { OS_InitThreadQueue(&OSi_IrqThreadQueue); OSi_SetVBlankCount(0); } -ARM_FUNC void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) +void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) { s32 i; OSIrqCallbackInfo *info; @@ -51,7 +51,7 @@ ARM_FUNC void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) } } -ARM_FUNC void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg) +void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg) { OSIrqMask mask = 1UL << (timerNo + 3); OSi_IrqCallbackInfo[timerNo + 4].func = callback; @@ -61,7 +61,7 @@ ARM_FUNC void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), voi OSi_IrqCallbackInfo[timerNo + 4].enable = TRUE; } -ARM_FUNC OSIrqMask OS_SetIrqMask(OSIrqMask mask) +OSIrqMask OS_SetIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -72,7 +72,7 @@ ARM_FUNC OSIrqMask OS_SetIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_EnableIrqMask(OSIrqMask mask) +OSIrqMask OS_EnableIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -83,7 +83,7 @@ ARM_FUNC OSIrqMask OS_EnableIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_DisableIrqMask(OSIrqMask mask) +OSIrqMask OS_DisableIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -94,7 +94,7 @@ ARM_FUNC OSIrqMask OS_DisableIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask) +OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; diff --git a/arm7/lib/src/OS_irqTable.c b/arm7/lib/src/OS_irqTable.c index 91c08b2e0..5150d5b59 100644 --- a/arm7/lib/src/OS_irqTable.c +++ b/arm7/lib/src/OS_irqTable.c @@ -1,6 +1,6 @@ #include "nitro/types.h" -#include "function_target.h" #include "OS_irqTable.h" +#include "code32.h" OSIrqFunction OS_IRQTable[25] = { OSi_IrqVBlank, @@ -46,12 +46,12 @@ static u16 OSi_IrqCallbackInfoIndex[9] = { 8, 9, 10, 11, 3, 4, 5, 6, 0 }; -ARM_FUNC void OS_IrqDummy(void) +void OS_IrqDummy(void) { //do nothing } -ARM_FUNC void OSi_IrqCallback(s32 index) +void OSi_IrqCallback(s32 index) { OSIrqMask imask = (1UL << OSi_IrqCallbackInfoIndex[index]); void (*callback) (void *) = OSi_IrqCallbackInfo[index].func; @@ -71,46 +71,46 @@ ARM_FUNC void OSi_IrqCallback(s32 index) } } -ARM_FUNC void OSi_IrqDma0(void) +void OSi_IrqDma0(void) { OSi_IrqCallback(0); } -ARM_FUNC void OSi_IrqDma1(void) +void OSi_IrqDma1(void) { OSi_IrqCallback(1); } -ARM_FUNC void OSi_IrqDma2(void) +void OSi_IrqDma2(void) { OSi_IrqCallback(2); } -ARM_FUNC void OSi_IrqDma3(void) +void OSi_IrqDma3(void) { OSi_IrqCallback(3); } -ARM_FUNC void OSi_IrqTimer0(void) +void OSi_IrqTimer0(void) { OSi_IrqCallback(4); } -ARM_FUNC void OSi_IrqTimer1(void) +void OSi_IrqTimer1(void) { OSi_IrqCallback(5); } -ARM_FUNC void OSi_IrqTimer2(void) +void OSi_IrqTimer2(void) { OSi_IrqCallback(6); } -ARM_FUNC void OSi_IrqTimer3(void) +void OSi_IrqTimer3(void) { OSi_IrqCallback(7); } -ARM_FUNC void OSi_IrqVBlank(void) +void OSi_IrqVBlank(void) { void (*callback) (void) = (void (*)(void))OSi_IrqCallbackInfo[8].func; diff --git a/arm7/lib/src/OS_message.c b/arm7/lib/src/OS_message.c index 62817517a..0b3118325 100644 --- a/arm7/lib/src/OS_message.c +++ b/arm7/lib/src/OS_message.c @@ -1,9 +1,9 @@ #include "OS_message.h" -#include "function_target.h" #include "OS_system.h" #include "OS_thread.h" +#include "code32.h" -ARM_FUNC void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount) +void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount) { OS_InitThreadQueue(&mq->queueSend); OS_InitThreadQueue(&mq->queueReceive); @@ -13,7 +13,7 @@ ARM_FUNC void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 m mq->usedCount = 0; } -ARM_FUNC BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) +BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -40,7 +40,7 @@ ARM_FUNC BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) return TRUE; } -ARM_FUNC BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) +BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -70,7 +70,7 @@ ARM_FUNC BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) return TRUE; } -ARM_FUNC BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) +BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); diff --git a/arm7/lib/src/OS_mutex.c b/arm7/lib/src/OS_mutex.c index 7e9b05ec6..3c1d42bf6 100644 --- a/arm7/lib/src/OS_mutex.c +++ b/arm7/lib/src/OS_mutex.c @@ -1,15 +1,15 @@ -#include "function_target.h" #include "OS_mutex.h" #include "OS_system.h" #include "OS_thread.h" +#include "code32.h" -ARM_FUNC void OS_InitMutex(OSMutex* mutex) { +void OS_InitMutex(OSMutex* mutex) { OS_InitThreadQueue(&mutex->queue); mutex->thread = NULL; mutex->count = 0; } -ARM_FUNC void OS_LockMutex(OSMutex* mutex) { +void OS_LockMutex(OSMutex* mutex) { OSIntrMode mode; OSThread* current; @@ -36,7 +36,7 @@ ARM_FUNC void OS_LockMutex(OSMutex* mutex) { (void)OS_RestoreInterrupts(mode); } -ARM_FUNC void OS_UnlockMutex(OSMutex* mutex) { +void OS_UnlockMutex(OSMutex* mutex) { OSIntrMode mode; OSThread* current; @@ -52,7 +52,7 @@ ARM_FUNC void OS_UnlockMutex(OSMutex* mutex) { (void)OS_RestoreInterrupts(mode); } -ARM_FUNC void OSi_UnlockAllMutex(OSThread * thread) { +void OSi_UnlockAllMutex(OSThread * thread) { OSMutex * mutex; while (thread->mutexQueue.head) { mutex = OSi_RemoveMutexLinkFromQueue(&thread->mutexQueue); @@ -62,7 +62,7 @@ ARM_FUNC void OSi_UnlockAllMutex(OSThread * thread) { } } -ARM_FUNC void OSi_EnqueueTail(OSThread * thread, OSMutex * mutex) { +void OSi_EnqueueTail(OSThread * thread, OSMutex * mutex) { OSMutex * tail = thread->mutexQueue.tail; if (tail == NULL) { thread->mutexQueue.head = mutex; @@ -75,7 +75,7 @@ ARM_FUNC void OSi_EnqueueTail(OSThread * thread, OSMutex * mutex) { thread->mutexQueue.tail = mutex; } -ARM_FUNC void OSi_DequeueItem(OSThread * thread, OSMutex * mutex) { +void OSi_DequeueItem(OSThread * thread, OSMutex * mutex) { OSMutex *next = mutex->link.next; OSMutex *prev = mutex->link.prev; diff --git a/arm7/lib/src/OS_reset.c b/arm7/lib/src/OS_reset.c index 13d59bfae..d3d07562b 100644 --- a/arm7/lib/src/OS_reset.c +++ b/arm7/lib/src/OS_reset.c @@ -1,8 +1,8 @@ -#include "function_target.h" #include "OS_reset.h" #include "OS_interrupt.h" #include "OS_terminate_proc.h" #include "PXI_fifo.h" +#include "code32.h" static u16 OSi_IsInitReset = 0; vu16 OSi_IsResetOccurred = 0; @@ -11,9 +11,9 @@ extern void MI_StopDma(u32 dma); extern OSIrqMask OS_SetIrqMask(OSIrqMask mask); extern OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask); extern void SND_Shutdown(void); -extern void FUN_038073EC(void); //OSi_DoResetSystem, in wram +extern void OSi_DoResetSystem(void); //in wram -ARM_FUNC void OS_InitReset(void) +void OS_InitReset(void) { if (OSi_IsInitReset) return; @@ -22,12 +22,12 @@ ARM_FUNC void OS_InitReset(void) PXI_SetFifoRecvCallback(PXI_FIFO_TAG_OS, OSi_CommonCallback); } -ARM_FUNC BOOL OS_IsResetOccurred(void) +BOOL OS_IsResetOccurred(void) { return OSi_IsResetOccurred; } -ARM_FUNC static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) +static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) { #pragma unused(tag, err) u16 command = (u16)((data & OS_PXI_COMMAND_MASK) >> OS_PXI_COMMAND_SHIFT); @@ -39,12 +39,12 @@ ARM_FUNC static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) OS_Terminate(); } -ARM_FUNC static void OSi_SendToPxi(u16 data) +static void OSi_SendToPxi(u16 data) { while (PXI_SendWordByFifo(PXI_FIFO_TAG_OS, (u32) data << 0x8, FALSE)) {} } -ARM_FUNC void OS_ResetSystem(void) { +void OS_ResetSystem(void) { MI_StopDma(0); MI_StopDma(1); MI_StopDma(2); @@ -54,5 +54,5 @@ ARM_FUNC void OS_ResetSystem(void) { (void)OS_ResetRequestIrqMask((u32)~0); SND_Shutdown(); OSi_SendToPxi(OS_PXI_COMMAND_RESET); - FUN_038073EC(); //OSi_DoResetSystem, in wram + OSi_DoResetSystem(); } diff --git a/arm7/lib/src/OS_spinLock.c b/arm7/lib/src/OS_spinLock.c index 2857de051..6b88dc158 100644 --- a/arm7/lib/src/OS_spinLock.c +++ b/arm7/lib/src/OS_spinLock.c @@ -1,9 +1,9 @@ -#include "function_target.h" #include "OS_spinLock.h" #include "OS_system.h" #include "MI_swap.h" +#include "code32.h" -ARM_FUNC void OS_InitLock(void) +void OS_InitLock(void) { static BOOL isInitialized = FALSE; @@ -25,12 +25,12 @@ ARM_FUNC void OS_InitLock(void) lockp->extension = 0xbf; } -ARM_FUNC void FUN_037F8CB4(s32 ct) +void FUN_037F8CB4(s32 ct) { SVC_WaitByLoop((u32)ct); //todo this should be linker generated, figure out why it broke } -ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFiq) { s32 lastLockFlag; @@ -41,7 +41,7 @@ ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) ( return lastLockFlag; } -ARM_FUNC s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFIQ) { if (lockID != lockp->ownerID) @@ -67,7 +67,7 @@ ARM_FUNC s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) return 0; } -ARM_FUNC s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFiq) { OSIntrMode lastIntrMode = (disableFiq) ? OS_DisableInterrupts_IrqAndFiq() : OS_DisableInterrupts(); @@ -95,43 +95,43 @@ ARM_FUNC s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp return lastLockFlag; } -ARM_FUNC s32 OS_LockCartridge(u16 lockID) +s32 OS_LockCartridge(u16 lockID) { return OSi_DoLockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_AllocateCartridgeBus, TRUE); } -ARM_FUNC s32 OS_UnlockCartridge(u16 lockID) +s32 OS_UnlockCartridge(u16 lockID) { return OSi_DoUnlockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_FreeCartridgeBus, TRUE); } -ARM_FUNC s32 OS_TryLockCartridge(u16 lockID) +s32 OS_TryLockCartridge(u16 lockID) { return OSi_DoTryLockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_AllocateCartridgeBus, TRUE); } -ARM_FUNC void OSi_AllocateCartridgeBus(void) +void OSi_AllocateCartridgeBus(void) { //noop } -ARM_FUNC void OSi_FreeCartridgeBus(void) +void OSi_FreeCartridgeBus(void) { //noop } -ARM_FUNC u16 OS_ReadOwnerOfLockWord(OSLockWord * lock) +u16 OS_ReadOwnerOfLockWord(OSLockWord * lock) { return lock->ownerID; } -ARM_FUNC asm s32 OS_UnLockCartridge(u16 lockID) +asm s32 OS_UnLockCartridge(u16 lockID) { ldr r1, =OS_UnlockCartridge bx r1 } -ARM_FUNC asm s32 OS_GetLockID(void) +asm s32 OS_GetLockID(void) { ldr r3, =HW_LOCK_ID_FLAG_SUB ldr r1, [r3] @@ -176,7 +176,7 @@ _037F8A98: bx lr } -ARM_FUNC asm void OS_ReleaseLockID(register u16 lockID) +asm void OS_ReleaseLockID(register u16 lockID) { ldr r3, =HW_LOCK_ID_FLAG_SUB cmp r0, #0xa0 diff --git a/arm7/lib/src/OS_system.c b/arm7/lib/src/OS_system.c index 503bd854e..1c908f60e 100644 --- a/arm7/lib/src/OS_system.c +++ b/arm7/lib/src/OS_system.c @@ -1,8 +1,8 @@ -#include "function_target.h" #include "OS_system.h" #include "OS_spinLock.h" +#include "code32.h" -ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) +asm OSIntrMode OS_EnableInterrupts(void) { mrs r0, CPSR bic r1, r0, #HW_PSR_DISABLE_IRQ @@ -11,7 +11,7 @@ ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) +asm OSIntrMode OS_DisableInterrupts(void) { mrs r0, CPSR orr r1, r0, #HW_PSR_DISABLE_IRQ @@ -20,7 +20,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(register OSIntrMode state) +asm OSIntrMode OS_RestoreInterrupts(register OSIntrMode state) { mrs r1, CPSR bic r2, r1, #HW_PSR_DISABLE_IRQ @@ -30,7 +30,7 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(register OSIntrMode state) bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) +asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) { mrs r0, CPSR orr r1, r0, #HW_PSR_DISABLE_IRQ_FIQ @@ -39,7 +39,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(register OSIntrMode state) +asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(register OSIntrMode state) { mrs r1, CPSR bic r2, r1, #HW_PSR_DISABLE_IRQ_FIQ @@ -49,14 +49,14 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(register OSIntrMode state bx lr } -ARM_FUNC asm OSProcMode OS_GetProcMode(void) +asm OSProcMode OS_GetProcMode(void) { mrs r0, CPSR and r0, r0, #HW_PSR_CPU_MODE_MASK bx lr } -ARM_FUNC void OS_SpinWait(u32 cycle) +void OS_SpinWait(u32 cycle) { FUN_037F8CB4((s32)cycle / 4); } diff --git a/arm7/lib/src/OS_terminate_proc.c b/arm7/lib/src/OS_terminate_proc.c index 23793fd47..97aa1961a 100644 --- a/arm7/lib/src/OS_terminate_proc.c +++ b/arm7/lib/src/OS_terminate_proc.c @@ -1,12 +1,12 @@ -#include "function_target.h" #include "nitro/types.h" #include "OS_terminate_proc.h" #include "OS_system.h" +#include "code32.h" extern void CTRDG_VibPulseEdgeUpdate(u32 param); -extern void FUN_037F8530(void); //SVC_Halt +extern void FUN_037F8530(void); //SVC_Halt thunk -ARM_FUNC void OS_Terminate(void) +void OS_Terminate(void) { CTRDG_VibPulseEdgeUpdate(0); while (TRUE) diff --git a/arm7/lib/src/OS_thread.c b/arm7/lib/src/OS_thread.c index 6db0b4f7a..0077144e0 100644 --- a/arm7/lib/src/OS_thread.c +++ b/arm7/lib/src/OS_thread.c @@ -1,5 +1,4 @@ #include "OS_thread.h" -#include "function_target.h" #include "OS_system.h" #include "consts.h" #include "OS_terminate_proc.h" @@ -8,6 +7,7 @@ #include "OS_context.h" #include "nitro/OS_systemWork_shared.h" #include "MI_memory.h" +#include "code32.h" extern void SDK_SYS_STACKSIZE(void); extern void SDK_IRQ_STACKSIZE(void); @@ -41,12 +41,12 @@ static void OSi_ExitThread(void *arg); static void OSi_ExitThread_Destroy(void); static void OSi_SleepAlarmCallback(void *arg); -ARM_FUNC static s32 OSi_GetUnusedThreadId(void) +static s32 OSi_GetUnusedThreadId(void) { return ++OSi_ThreadIdCount; } -ARM_FUNC static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread) +static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread) { OSThread *next = queue->head; @@ -93,7 +93,7 @@ ARM_FUNC static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *threa } } -ARM_FUNC static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) +static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) { OSThread *thread = queue->head; @@ -117,7 +117,7 @@ ARM_FUNC static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) return thread; } -ARM_FUNC static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread) +static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread) { OSThread *queueHead = queue->head; @@ -156,7 +156,7 @@ ARM_FUNC static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, return queueHead; } -ARM_FUNC OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) +OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) { OSMutex *mutexHead = queue->head; @@ -179,7 +179,7 @@ ARM_FUNC OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) return mutexHead; } -ARM_FUNC static void OSi_InsertThreadToList(OSThread *thread) +static void OSi_InsertThreadToList(OSThread *thread) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -202,7 +202,7 @@ ARM_FUNC static void OSi_InsertThreadToList(OSThread *thread) } } -ARM_FUNC static void OSi_RemoveThreadFromList(OSThread *thread) +static void OSi_RemoveThreadFromList(OSThread *thread) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -223,7 +223,7 @@ ARM_FUNC static void OSi_RemoveThreadFromList(OSThread *thread) } } -ARM_FUNC static void OSi_RescheduleThread(void) +static void OSi_RescheduleThread(void) { if (OSi_RescheduleCount <= 0) { @@ -261,7 +261,7 @@ ARM_FUNC static void OSi_RescheduleThread(void) } } -ARM_FUNC void OS_InitThread(void) +void OS_InitThread(void) { if (OSi_IsThreadInitialized) return; @@ -302,7 +302,7 @@ ARM_FUNC void OS_InitThread(void) (void)OS_SetSwitchThreadCallback(NULL); } -ARM_FUNC void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio) +void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio) { OSIntrMode enable = OS_DisableInterrupts(); @@ -348,13 +348,13 @@ ARM_FUNC void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg (void)OS_RestoreInterrupts(enable); } -ARM_FUNC void OS_ExitThread(void) +void OS_ExitThread(void) { (void)OS_DisableInterrupts(); OSi_ExitThread_ArgSpecified(OS_GetCurrentThread(), 0); } -ARM_FUNC static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) +static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) { if (OSi_StackForDestructor) { @@ -370,7 +370,7 @@ ARM_FUNC static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) } } -ARM_FUNC static void OSi_ExitThread(void *arg) +static void OSi_ExitThread(void *arg) { OSThread *currentThread = OSi_GetCurrentThread(); OSThreadDestructor destructor = currentThread->destructor; @@ -385,7 +385,7 @@ ARM_FUNC static void OSi_ExitThread(void *arg) OSi_ExitThread_Destroy(); } -ARM_FUNC static void OSi_ExitThread_Destroy(void) +static void OSi_ExitThread_Destroy(void) { OSThread *currentThread = OSi_GetCurrentThread(); (void)OS_DisableScheduler(); @@ -410,7 +410,7 @@ ARM_FUNC static void OSi_ExitThread_Destroy(void) OS_Terminate(); } -ARM_FUNC void OS_JoinThread(OSThread *thread) +void OS_JoinThread(OSThread *thread) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -422,12 +422,12 @@ ARM_FUNC void OS_JoinThread(OSThread *thread) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC BOOL OS_IsThreadTerminated(const OSThread *thread) +BOOL OS_IsThreadTerminated(const OSThread *thread) { return (thread->state == OS_THREAD_STATE_TERMINATED) ? TRUE : FALSE; } -ARM_FUNC void OS_SleepThread(OSThreadQueue *queue) +void OS_SleepThread(OSThreadQueue *queue) { OSIntrMode enabled = OS_DisableInterrupts(); OSThread *currentThread = OSi_GetCurrentThread(); @@ -444,7 +444,7 @@ ARM_FUNC void OS_SleepThread(OSThreadQueue *queue) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_WakeupThread(OSThreadQueue *queue) +void OS_WakeupThread(OSThreadQueue *queue) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -466,7 +466,7 @@ ARM_FUNC void OS_WakeupThread(OSThreadQueue *queue) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_WakeupThreadDirect(OSThread *thread) +void OS_WakeupThreadDirect(OSThread *thread) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -476,7 +476,7 @@ ARM_FUNC void OS_WakeupThreadDirect(OSThread *thread) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC OSThread *OS_SelectThread(void) +OSThread *OS_SelectThread(void) { OSThread *thread = OSi_ThreadInfo.list; @@ -488,14 +488,14 @@ ARM_FUNC OSThread *OS_SelectThread(void) return thread; } -ARM_FUNC void OS_RescheduleThread(void) +void OS_RescheduleThread(void) { OSIntrMode enabled = OS_DisableInterrupts(); OSi_RescheduleThread(); (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) +BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -535,7 +535,7 @@ ARM_FUNC BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) return TRUE; } -ARM_FUNC void OS_Sleep(u32 msec) +void OS_Sleep(u32 msec) { OSAlarm alarm; @@ -554,7 +554,7 @@ ARM_FUNC void OS_Sleep(u32 msec) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC static void OSi_SleepAlarmCallback(void *arg) +static void OSi_SleepAlarmCallback(void *arg) { OSThread **pp_thread = (OSThread **)arg; OSThread *p_thread = *pp_thread; @@ -565,7 +565,7 @@ ARM_FUNC static void OSi_SleepAlarmCallback(void *arg) OS_WakeupThreadDirect(p_thread); } -ARM_FUNC OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback) +OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback) { OSIntrMode enabled = OS_DisableInterrupts(); OSSwitchThreadCallback prev = OSi_ThreadInfo.switchCallback; @@ -575,7 +575,7 @@ ARM_FUNC OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallbac return prev; } -ARM_FUNC u32 OS_DisableScheduler(void) +u32 OS_DisableScheduler(void) { OSIntrMode enabled = OS_DisableInterrupts(); u32 count; @@ -589,7 +589,7 @@ ARM_FUNC u32 OS_DisableScheduler(void) return count; } -ARM_FUNC u32 OS_EnableScheduler(void) +u32 OS_EnableScheduler(void) { OSIntrMode enabled = OS_DisableInterrupts(); u32 count = 0; @@ -603,7 +603,7 @@ ARM_FUNC u32 OS_EnableScheduler(void) return count; } -ARM_FUNC void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor) +void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor) { thread->destructor = dtor; } diff --git a/arm7/lib/src/OS_tick.c b/arm7/lib/src/OS_tick.c index bc42a54f3..1e69128f4 100644 --- a/arm7/lib/src/OS_tick.c +++ b/arm7/lib/src/OS_tick.c @@ -2,13 +2,13 @@ #include "OS_system.h" #include "OS_tick.h" #include "OS_timer.h" -#include "function_target.h" +#include "code32.h" static u16 OSi_UseTick; static OSTick OSi_TickCounter; static BOOL OSi_NeedResetTimer; -ARM_FUNC void OS_InitTick(void) { +void OS_InitTick(void) { if (OSi_UseTick == 0) { OSi_UseTick = 1; OSi_SetTimerReserved(0); @@ -22,11 +22,11 @@ ARM_FUNC void OS_InitTick(void) { } } -ARM_FUNC u16 OS_IsTickAvailable(void) { +u16 OS_IsTickAvailable(void) { return OSi_UseTick; } -ARM_FUNC void OSi_CountUpTick(void) { +void OSi_CountUpTick(void) { OSi_TickCounter++; if (OSi_NeedResetTimer != 0) { OS_SetTimerControl(OS_TIMER_0, 0); @@ -37,7 +37,7 @@ ARM_FUNC void OSi_CountUpTick(void) { OSi_EnterTimerCallback(0, (void(*)(void*))OSi_CountUpTick, NULL); } -ARM_FUNC OSTick OS_GetTick(void) { +OSTick OS_GetTick(void) { OSIntrMode prev = OS_DisableInterrupts(); vu16 countL = *(REGType16 *)((u32)®_OS_TM0CNT_L + OS_TIMER_0 * 4); vu64 countH = OSi_TickCounter & 0xffffffffffffULL; diff --git a/arm7/lib/src/OS_timer.c b/arm7/lib/src/OS_timer.c index 69a1a6cdb..886c0abce 100644 --- a/arm7/lib/src/OS_timer.c +++ b/arm7/lib/src/OS_timer.c @@ -1,9 +1,9 @@ #include "OS_timer.h" -#include "function_target.h" +#include "code32.h" static u16 OSi_TimerReserved = 0; -ARM_FUNC void OSi_SetTimerReserved(s32 timerNum) +void OSi_SetTimerReserved(s32 timerNum) { OSi_TimerReserved |= (1 << timerNum); } diff --git a/arm7/lib/src/PAD_xyButton.c b/arm7/lib/src/PAD_xyButton.c index 7c3eeac8d..169d93a77 100644 --- a/arm7/lib/src/PAD_xyButton.c +++ b/arm7/lib/src/PAD_xyButton.c @@ -1,15 +1,15 @@ -#include "function_target.h" #include "OS_alarm.h" #include "OS_tick.h" #include "PAD_xyButton.h" #include "registers.h" +#include "code32.h" static BOOL PADi_XYButtonAvailable; static OSAlarm PADi_Alarm; void EXIi_SelectRcnt(u16); -ARM_FUNC BOOL PAD_InitXYButton(void) { +BOOL PAD_InitXYButton(void) { OSTick tick; if (!OS_IsTickAvailable() || !OS_IsAlarmAvailable()) return FALSE; diff --git a/arm7/lib/src/SND_alarm.c b/arm7/lib/src/SND_alarm.c index 9b71d8f3a..6c2c185d1 100644 --- a/arm7/lib/src/SND_alarm.c +++ b/arm7/lib/src/SND_alarm.c @@ -4,6 +4,7 @@ #include "OS_tick.h" #include "PXI_fifo.h" #include "SND_work.h" +#include "code32.h" static void AlarmHandler(void *msg); diff --git a/arm7/lib/src/SND_bank.c b/arm7/lib/src/SND_bank.c index 3437e021d..7ab7bbe3a 100644 --- a/arm7/lib/src/SND_bank.c +++ b/arm7/lib/src/SND_bank.c @@ -4,6 +4,7 @@ #include "SND_main.h" #include "mmap.h" +#include "code32.h" static const struct SNDWaveData *GetWaveData( const struct SNDBankData *bankData, s32 waveArc, s32 wave); diff --git a/arm7/lib/src/SND_capture.c b/arm7/lib/src/SND_capture.c index 57494b725..e6cfa2e6e 100644 --- a/arm7/lib/src/SND_capture.c +++ b/arm7/lib/src/SND_capture.c @@ -1,6 +1,7 @@ #include "SND_capture.h" #include "registers.h" +#include "code32.h" enum SNDLoop { diff --git a/arm7/lib/src/SND_channel.c b/arm7/lib/src/SND_channel.c index be0bba3a8..adbbef6c7 100644 --- a/arm7/lib/src/SND_channel.c +++ b/arm7/lib/src/SND_channel.c @@ -2,6 +2,7 @@ #include "SND_work.h" #include "registers.h" +#include "code32.h" static int sMasterPan = -1; diff --git a/arm7/lib/src/SND_command.c b/arm7/lib/src/SND_command.c index f561138a2..4b0a865d2 100644 --- a/arm7/lib/src/SND_command.c +++ b/arm7/lib/src/SND_command.c @@ -16,6 +16,8 @@ #include "SND_seq.h" #include "SND_work.h" +#include "code32.h" + #define SND_MSG_ARRAY_SIZE 8 static OSMessage sMsgArray[SND_MSG_ARRAY_SIZE]; diff --git a/arm7/lib/src/SND_exChannel.c b/arm7/lib/src/SND_exChannel.c index dfaabedaa..db3e5f40b 100644 --- a/arm7/lib/src/SND_exChannel.c +++ b/arm7/lib/src/SND_exChannel.c @@ -6,6 +6,7 @@ #include "SND_work.h" #include "registers.h" +#include "code32.h" // TODO import these tables into here if we have a working .rodata section extern const u8 sChannelAllocationOrder[SND_CHANNEL_COUNT]; diff --git a/arm7/lib/src/SND_global.c b/arm7/lib/src/SND_global.c index c78fcd5f8..dce5dd0f5 100644 --- a/arm7/lib/src/SND_global.c +++ b/arm7/lib/src/SND_global.c @@ -7,6 +7,7 @@ #include "PM.h" #include "registers.h" #include "syscall.h" +#include "code32.h" void SND_Enable(void) { diff --git a/arm7/lib/src/SND_main.c b/arm7/lib/src/SND_main.c index fbf84573a..da7ebc8cb 100644 --- a/arm7/lib/src/SND_main.c +++ b/arm7/lib/src/SND_main.c @@ -1,7 +1,5 @@ #include "SND_main.h" -#include "global.h" - #include "SND_alarm.h" #include "SND_capture.h" #include "SND_command.h" @@ -15,6 +13,7 @@ #include "OS_message.h" #include "OS_thread.h" #include "OS_tick.h" +#include "code32.h" static void FUN_037fc330(void *); static void SndThread(void *); @@ -105,7 +104,7 @@ static void SndThread(void *arg) SND_SetMasterVolume(0x7F); SND_StartIntervalTimer(); - while (1) + while (TRUE) { BOOL update = FALSE; diff --git a/arm7/lib/src/SND_seq.c b/arm7/lib/src/SND_seq.c index 15b60596a..375600f03 100644 --- a/arm7/lib/src/SND_seq.c +++ b/arm7/lib/src/SND_seq.c @@ -6,6 +6,7 @@ #include "SND_main.h" #include "SND_util.h" #include "SND_work.h" +#include "code32.h" #define SND_TIMER_RATE 240 diff --git a/arm7/lib/src/SND_util.c b/arm7/lib/src/SND_util.c index 5c0b220bb..f6dfccfae 100644 --- a/arm7/lib/src/SND_util.c +++ b/arm7/lib/src/SND_util.c @@ -1,6 +1,7 @@ #include "SND_util.h" #include "syscall.h" +#include "code32.h" // TODO remove this extern once the static const definition of it is here extern s8 sLfoSinTable[0x21]; diff --git a/arm7/lib/src/SND_work.c b/arm7/lib/src/SND_work.c index 2256ee3f4..c0b6d1e1a 100644 --- a/arm7/lib/src/SND_work.c +++ b/arm7/lib/src/SND_work.c @@ -3,6 +3,7 @@ #include "SND_capture.h" #include "SND_channel.h" #include "SND_exChannel.h" +#include "code32.h" struct SNDWork SNDi_Work; struct SNDSharedWork *SNDi_SharedWork; diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index a5ca616aa..675188c44 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -13,125 +13,6 @@ .text - thumb_func_start ScrCmd_Unk0209 -ScrCmd_Unk0209: ; 0x0203BE50 - push {r3, lr} - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x14 - bl FieldSysGetAttrAddr - ldr r0, [r0, #0x0] - mov r1, #0x1 - strb r1, [r0, #0x0] - add r0, r1, #0x0 - pop {r3, pc} - .balign 4 - - thumb_func_start ScrCmd_Unk028D -ScrCmd_Unk028D: ; 0x0203BE68 - push {r3, lr} - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x14 - bl FieldSysGetAttrAddr - ldr r0, [r0, #0x0] - mov r1, #0x2 - strb r1, [r0, #0x0] - mov r0, #0x1 - pop {r3, pc} - .balign 4 - - thumb_func_start ScrCmd_Unk028E -ScrCmd_Unk028E: ; 0x0203BE80 - push {r4, lr} - add r4, r0, #0x0 - bl ScriptReadHalfword - str r0, [r4, #0x64] - ldr r1, _0203BE98 ; =FUN_0203BE9C - add r0, r4, #0x0 - bl SetupNativeScript - mov r0, #0x1 - pop {r4, pc} - nop -_0203BE98: .word FUN_0203BE9C - - thumb_func_start FUN_0203BE9C -FUN_0203BE9C: ; 0x0203BE9C - push {r3-r5, lr} - add r5, r0, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x14 - bl FieldSysGetAttrAddr - add r4, r0, #0x0 - add r0, r5, #0x0 - ldr r1, [r5, #0x64] - add r0, #0x80 - lsl r1, r1, #0x10 - ldr r0, [r0, #0x0] - lsr r1, r1, #0x10 - bl GetVarPointer - ldr r0, [r4, #0x0] - ldrb r0, [r0, #0x0] - cmp r0, #0x3 - beq _0203BEC8 - mov r0, #0x1 - pop {r3-r5, pc} -_0203BEC8: - mov r0, #0x0 - pop {r3-r5, pc} - - thumb_func_start ScrCmd_Unk020A -ScrCmd_Unk020A: ; 0x0203BECC - push {r4-r6, lr} - add r5, r0, #0x0 - bl ScriptReadHalfword - add r6, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0xf - bl FieldSysGetAttrAddr - add r4, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - add r1, r6, #0x0 - bl GetVarPointer - add r2, r0, #0x0 - ldr r0, [r5, #0x74] - ldr r1, [r4, #0x0] - bl MOD05_021E1374 - mov r0, #0x1 - pop {r4-r6, pc} - .balign 4 - - thumb_func_start ScrCmd_Unk020B -ScrCmd_Unk020B: ; 0x0203BF00 - push {r4, lr} - add r4, r0, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0xa - bl FieldSysGetAttrAddr - ldr r1, [r0, #0x0] - cmp r1, #0x0 - beq _0203BF1C - add r4, #0x80 - ldr r0, [r4, #0x0] - bl MOD05_021E1994 -_0203BF1C: - mov r0, #0x0 - pop {r4, pc} - - thumb_func_start ScrCmd_Unk00A5 -ScrCmd_Unk00A5: ; 0x0203BF20 - push {r3, lr} - ldr r0, [r0, #0x74] - bl FUN_0208A338 - mov r0, #0x1 - pop {r3, pc} - thumb_func_start ScrCmd_Unk00A6 ScrCmd_Unk00A6: ; 0x0203BF2C push {r3-r6, lr} diff --git a/arm9/lib/NitroSDK/include/MI_swap.h b/arm9/lib/NitroSDK/include/MI_swap.h index 433b5804f..27f5e571b 100644 --- a/arm9/lib/NitroSDK/include/MI_swap.h +++ b/arm9/lib/NitroSDK/include/MI_swap.h @@ -1,6 +1,8 @@ #ifndef NITRO_MI_SWAP_H_ #define NITRO_MI_SWAP_H_ +#include "nitro/types.h" + u32 MI_SwapWord(u32 setData, volatile u32 * destp); #endif //NITRO_MI_SWAP_H_ diff --git a/arm9/lib/NitroSDK/include/SND_alarm.h b/arm9/lib/NitroSDK/include/SND_alarm.h index 07b77f452..a4aa9db0c 100644 --- a/arm9/lib/NitroSDK/include/SND_alarm.h +++ b/arm9/lib/NitroSDK/include/SND_alarm.h @@ -1,7 +1,7 @@ #ifndef GUARD_SND_ALARM_H #define GUARD_SND_ALARM_H -#include "global.h" +#include "nitro/types.h" #include "nitro/SND_alarm_shared.h" typedef void (*SNDAlarmCallback)(void *); diff --git a/arm9/lib/NitroSDK/include/SND_bank.h b/arm9/lib/NitroSDK/include/SND_bank.h index 58fd83072..23d28f7a5 100644 --- a/arm9/lib/NitroSDK/include/SND_bank.h +++ b/arm9/lib/NitroSDK/include/SND_bank.h @@ -1,8 +1,7 @@ #ifndef GUARD_SND_BANK_H #define GUARD_SND_BANK_H -#include "global.h" - +#include "nitro/types.h" #include "SND_main.h" #include "nitro/SND_bank_shared.h" diff --git a/arm9/lib/NitroSDK/include/SND_interface.h b/arm9/lib/NitroSDK/include/SND_interface.h index d0898f85f..98377c5f9 100644 --- a/arm9/lib/NitroSDK/include/SND_interface.h +++ b/arm9/lib/NitroSDK/include/SND_interface.h @@ -1,7 +1,7 @@ #ifndef GUARD_SND_INTERFACE_H #define GUARD_SND_INTERFACE_H -#include "global.h" +#include "nitro/types.h" #include "SND_bank.h" #include "SND_work.h" #include "SND_alarm.h" diff --git a/arm9/lib/NitroSDK/include/SND_main.h b/arm9/lib/NitroSDK/include/SND_main.h index aa476bae4..e3f6316f7 100644 --- a/arm9/lib/NitroSDK/include/SND_main.h +++ b/arm9/lib/NitroSDK/include/SND_main.h @@ -1,7 +1,7 @@ #ifndef GUARD_SND_MAIN_H #define GUARD_SND_MAIN_H -#include "global.h" +#include "nitro/types.h" #include "nitro/SND_main_shared.h" diff --git a/arm9/lib/NitroSDK/include/SND_util.h b/arm9/lib/NitroSDK/include/SND_util.h index 4137459a3..5067d709a 100644 --- a/arm9/lib/NitroSDK/include/SND_util.h +++ b/arm9/lib/NitroSDK/include/SND_util.h @@ -1,7 +1,7 @@ #ifndef GUARD_SND_UTIL_H #define GUARD_SND_UTIL_H -#include "global.h" +#include "nitro/types.h" void SND_CalcTimer(void); u16 SND_CalcChannelVolume(s32 x); diff --git a/arm9/lib/NitroSDK/include/SND_work.h b/arm9/lib/NitroSDK/include/SND_work.h index f3ed08c8c..095792970 100644 --- a/arm9/lib/NitroSDK/include/SND_work.h +++ b/arm9/lib/NitroSDK/include/SND_work.h @@ -1,7 +1,7 @@ #ifndef GUARD_SND_WORK_H #define GUARD_SND_WORK_H -#include "global.h" +#include "nitro/types.h" #include "SND_main.h" #include "nitro/SND_work_shared.h" diff --git a/include/WIFI_stubsmd5_dummy.h b/arm9/lib/NitroSDK/include/WIFI_stubsmd5_dummy.h similarity index 61% rename from include/WIFI_stubsmd5_dummy.h rename to arm9/lib/NitroSDK/include/WIFI_stubsmd5_dummy.h index d82b55c5a..34f45a59b 100644 --- a/include/WIFI_stubsmd5_dummy.h +++ b/arm9/lib/NitroSDK/include/WIFI_stubsmd5_dummy.h @@ -1,5 +1,5 @@ -#ifndef POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H -#define POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H +#ifndef POKEDIAMOND_ARM9_WIFI_STUBSMD5_DUMMY_H +#define POKEDIAMOND_ARM9_WIFI_STUBSMD5_DUMMY_H #include "nitro/types.h" #include "dgt.h" @@ -8,4 +8,4 @@ void MD5Final(u8 *digest, struct DGTHash1Context *context); void MD5Update(struct DGTHash1Context *context, u8 *input, u32 length); void MD5Init(struct DGTHash1Context *context); -#endif //POKEDIAMOND_WIFI_STUBSMD5_DUMMY_H +#endif //POKEDIAMOND_ARM9_WIFI_STUBSMD5_DUMMY_H diff --git a/arm9/lib/NitroSDK/src/CARD_backup.c b/arm9/lib/NitroSDK/src/CARD_backup.c index 714ac4799..8100c8418 100644 --- a/arm9/lib/NitroSDK/src/CARD_backup.c +++ b/arm9/lib/NitroSDK/src/CARD_backup.c @@ -1,5 +1,5 @@ #include "CARD_backup.h" -#include "function_target.h" +#include "nitro/types.h" #include "CARD_common.h" #include "CARD_request.h" #include "CARD_spi.h" @@ -7,6 +7,7 @@ #include "MI_memory.h" #include "OS_terminate_proc.h" #include "OS_system.h" +#include "code32.h" extern void OSi_ReferSymbol(void *symbol); extern char _SDK_NintendoBackup[]; @@ -15,7 +16,7 @@ extern CARDiCommon cardi_common; static void CARDi_RequestStreamCommandCore(CARDiCommon *p); -ARM_FUNC static void CARDi_RequestStreamCommandCore(CARDiCommon *p) +static void CARDi_RequestStreamCommandCore(CARDiCommon *p) { const int req_type = p->req_type; const int req_mode = p->req_mode; @@ -84,7 +85,7 @@ ARM_FUNC static void CARDi_RequestStreamCommandCore(CARDiCommon *p) CARDi_EndTask(p, TRUE); } -ARM_FUNC BOOL CARDi_RequestStreamCommand(u32 src, u32 dst, u32 len, MIDmaCallback callback, void *arg, BOOL is_async, +BOOL CARDi_RequestStreamCommand(u32 src, u32 dst, u32 len, MIDmaCallback callback, void *arg, BOOL is_async, CARDRequest req_type, int req_retry, CARDRequestMode req_mode) { CARDiCommon *const p = &cardi_common; @@ -111,12 +112,12 @@ ARM_FUNC BOOL CARDi_RequestStreamCommand(u32 src, u32 dst, u32 len, MIDmaCallbac } } -ARM_FUNC u32 CARD_GetBackupSectorSize(void) +u32 CARD_GetBackupSectorSize(void) { return cardi_common.cmd->spec.sect_size; } -ARM_FUNC BOOL CARD_IdentifyBackup(CARDBackupType type) +BOOL CARD_IdentifyBackup(CARDBackupType type) { CARDiCommon *const p = &cardi_common; @@ -141,17 +142,17 @@ ARM_FUNC BOOL CARD_IdentifyBackup(CARDBackupType type) return (p->cmd->result == CARD_RESULT_SUCCESS); } -ARM_FUNC BOOL CARD_WaitBackupAsync(void) +BOOL CARD_WaitBackupAsync(void) { return CARDi_WaitAsync(); } -ARM_FUNC BOOL CARD_TryWaitBackupAsync(void) +BOOL CARD_TryWaitBackupAsync(void) { return CARDi_TryWaitAsync(); } -ARM_FUNC void CARD_CancelBackupAsync(void) +void CARD_CancelBackupAsync(void) { OSIntrMode bak_cpsr = OS_DisableInterrupts(); cardi_common.flag |= CARD_STAT_CANCEL; diff --git a/arm9/lib/NitroSDK/src/CARD_common.c b/arm9/lib/NitroSDK/src/CARD_common.c index fd66c7ce5..3bde134b6 100644 --- a/arm9/lib/NitroSDK/src/CARD_common.c +++ b/arm9/lib/NitroSDK/src/CARD_common.c @@ -1,7 +1,6 @@ #include "CARD_common.h" #include "CARD_request.h" #include "consts.h" -#include "function_target.h" #include "MI_memory.h" #include "OS_terminate_proc.h" #include "OS_spinLock.h" @@ -9,6 +8,7 @@ #include "MB_mb.h" #include "PXI_fifo.h" #include "mmap.h" +#include "code32.h" CARDiCommon cardi_common ALIGN(32); static CARDiCommandArg cardi_arg ALIGN(32); @@ -18,7 +18,7 @@ u8 cardi_thread_stack[0x400] ALIGN(4); static void CARDi_LockResource(CARDiOwner owner, CARDTargetMode target); static void CARDi_UnlockResource(CARDiOwner owner, CARDTargetMode target); -ARM_FUNC void CARDi_SetTask(void (*task) (CARDiCommon *)) +void CARDi_SetTask(void (*task) (CARDiCommon *)) { CARDiCommon *const p = &cardi_common; @@ -30,7 +30,7 @@ ARM_FUNC void CARDi_SetTask(void (*task) (CARDiCommon *)) OS_WakeupThreadDirect(p->thread); } -ARM_FUNC static void CARDi_LockResource(CARDiOwner owner, CARDTargetMode target) +static void CARDi_LockResource(CARDiOwner owner, CARDTargetMode target) { CARDiCommon *const p = &cardi_common; OSIntrMode bak_psr = OS_DisableInterrupts(); @@ -55,7 +55,7 @@ ARM_FUNC static void CARDi_LockResource(CARDiOwner owner, CARDTargetMode target) (void)OS_RestoreInterrupts(bak_psr); } -ARM_FUNC static void CARDi_UnlockResource(CARDiOwner owner, CARDTargetMode target) +static void CARDi_UnlockResource(CARDiOwner owner, CARDTargetMode target) { CARDiCommon *p = &cardi_common; OSIntrMode bak_psr = OS_DisableInterrupts(); @@ -80,7 +80,7 @@ ARM_FUNC static void CARDi_UnlockResource(CARDiOwner owner, CARDTargetMode targe (void)OS_RestoreInterrupts(bak_psr); } -ARM_FUNC void CARDi_InitCommon(void) +void CARDi_InitCommon(void) { CARDiCommon *p = &cardi_common; @@ -113,12 +113,12 @@ ARM_FUNC void CARDi_InitCommon(void) static BOOL CARDi_EnableFlag = FALSE; -ARM_FUNC BOOL CARD_IsEnabled(void) +BOOL CARD_IsEnabled(void) { return CARDi_EnableFlag; } -ARM_FUNC void CARD_CheckEnabled(void) +void CARD_CheckEnabled(void) { if (!CARD_IsEnabled()) { @@ -126,12 +126,12 @@ ARM_FUNC void CARD_CheckEnabled(void) } } -ARM_FUNC void CARD_Enable(BOOL enable) +void CARD_Enable(BOOL enable) { CARDi_EnableFlag = enable; } -ARM_FUNC BOOL CARDi_WaitAsync(void) +BOOL CARDi_WaitAsync(void) { CARDiCommon *const p = &cardi_common; @@ -144,38 +144,38 @@ ARM_FUNC BOOL CARDi_WaitAsync(void) return (p->cmd->result == CARD_RESULT_SUCCESS); } -ARM_FUNC BOOL CARDi_TryWaitAsync(void) +BOOL CARDi_TryWaitAsync(void) { CARDiCommon *const p = &cardi_common; return !(p->flag & CARD_STAT_BUSY); } -ARM_FUNC CARDResult CARD_GetResultCode(void) +CARDResult CARD_GetResultCode(void) { CARDiCommon *const p = &cardi_common; return p->cmd->result; } -ARM_FUNC void CARD_LockRom(u16 lock_id) +void CARD_LockRom(u16 lock_id) { CARDi_LockResource(lock_id, CARD_TARGET_ROM); (void)OS_TryLockCard(lock_id); } -ARM_FUNC void CARD_UnlockRom(u16 lock_id) +void CARD_UnlockRom(u16 lock_id) { (void)OS_UnlockCard(lock_id); CARDi_UnlockResource(lock_id, CARD_TARGET_ROM); } -ARM_FUNC void CARD_LockBackup(u16 lock_id) +void CARD_LockBackup(u16 lock_id) { CARDi_LockResource(lock_id, CARD_TARGET_BACKUP); } -ARM_FUNC void CARD_UnlockBackup(u16 lock_id) +void CARD_UnlockBackup(u16 lock_id) { CARDi_UnlockResource(lock_id, CARD_TARGET_BACKUP); } diff --git a/arm9/lib/NitroSDK/src/CARD_pullOut.c b/arm9/lib/NitroSDK/src/CARD_pullOut.c index d5c7737fa..9e37526ee 100644 --- a/arm9/lib/NitroSDK/src/CARD_pullOut.c +++ b/arm9/lib/NitroSDK/src/CARD_pullOut.c @@ -1,4 +1,3 @@ -#include "function_target.h" #include "CARD_common.h" #include "CARD_pullOut.h" #include "PXI_init.h" @@ -9,6 +8,7 @@ #include "SPI_pm.h" #include "syscall.h" #include "mmap.h" +#include "code32.h" static CARDPulledOutCallback CARD_UserCallback; static BOOL CARDi_IsPulledOutFlag = FALSE; @@ -16,7 +16,7 @@ static BOOL CARDi_IsPulledOutFlag = FALSE; static void CARDi_PulledOutCallback(PXIFifoTag tag, u32 data, BOOL err); static void CARDi_SendtoPxi(u32 data, u32 wait); -ARM_FUNC void CARD_InitPulledOutCallback(void) +void CARD_InitPulledOutCallback(void) { PXI_Init(); @@ -25,7 +25,7 @@ ARM_FUNC void CARD_InitPulledOutCallback(void) CARD_UserCallback = NULL; } -ARM_FUNC static void CARDi_PulledOutCallback(PXIFifoTag tag, u32 data, BOOL err) +static void CARDi_PulledOutCallback(PXIFifoTag tag, u32 data, BOOL err) { #pragma unused(tag, err) u32 command = data & CARD_PXI_COMMAND_MASK; @@ -54,12 +54,12 @@ ARM_FUNC static void CARDi_PulledOutCallback(PXIFifoTag tag, u32 data, BOOL err) } } -ARM_FUNC BOOL CARD_IsPulledOut(void) +BOOL CARD_IsPulledOut(void) { return CARDi_IsPulledOutFlag; } -ARM_FUNC void CARD_TerminateForPulledOut(void) +void CARD_TerminateForPulledOut(void) { BOOL should_be_halt = TRUE; @@ -84,7 +84,7 @@ ARM_FUNC void CARD_TerminateForPulledOut(void) OS_Terminate(); } -ARM_FUNC void CARDi_CheckPulledOutCore(u32 id) +void CARDi_CheckPulledOutCore(u32 id) { vu32 iplCardID = *(vu32 *)((*(u16 *)HW_CHECK_DEBUGGER_SW == 0) ? HW_RED_RESERVED : HW_BOOT_CHECK_INFO_BUF); @@ -96,7 +96,7 @@ ARM_FUNC void CARDi_CheckPulledOutCore(u32 id) } } -ARM_FUNC static void CARDi_SendtoPxi(u32 data, u32 wait) +static void CARDi_SendtoPxi(u32 data, u32 wait) { while (PXI_SendWordByFifo(PXI_FIFO_TAG_CARD, data, FALSE) != PXI_FIFO_SUCCESS) { diff --git a/arm9/lib/NitroSDK/src/CARD_request.c b/arm9/lib/NitroSDK/src/CARD_request.c index 098fe7a57..5265323c2 100644 --- a/arm9/lib/NitroSDK/src/CARD_request.c +++ b/arm9/lib/NitroSDK/src/CARD_request.c @@ -1,12 +1,12 @@ -#include "function_target.h" #include "CARD_request.h" #include "OS_cache.h" #include "OS_system.h" #include "OS_thread.h" +#include "code32.h" extern CARDiCommon cardi_common; -ARM_FUNC void CARDi_OnFifoRecv(PXIFifoTag tag, u32 data, BOOL err) +void CARDi_OnFifoRecv(PXIFifoTag tag, u32 data, BOOL err) { #pragma unused (data) if ((tag == PXI_FIFO_TAG_FS) && err) @@ -17,7 +17,7 @@ ARM_FUNC void CARDi_OnFifoRecv(PXIFifoTag tag, u32 data, BOOL err) } } -ARM_FUNC void CARDi_TaskThread(void *arg) +void CARDi_TaskThread(void *arg) { #pragma unused (arg) CARDiCommon *const p = &cardi_common; @@ -35,7 +35,7 @@ ARM_FUNC void CARDi_TaskThread(void *arg) } } -ARM_FUNC BOOL CARDi_Request(CARDiCommon *p, s32 req_type, s32 retry_count) +BOOL CARDi_Request(CARDiCommon *p, s32 req_type, s32 retry_count) { if ((p->flag & CARD_STAT_INIT_CMD) == 0) { diff --git a/arm9/lib/NitroSDK/src/CARD_rom.c b/arm9/lib/NitroSDK/src/CARD_rom.c index 6d6b1ff8a..0b49a6495 100644 --- a/arm9/lib/NitroSDK/src/CARD_rom.c +++ b/arm9/lib/NitroSDK/src/CARD_rom.c @@ -1,4 +1,3 @@ -#include "function_target.h" #include "nitro/types.h" #include "CARD_pullOut.h" #include "CARD_rom.h" @@ -6,6 +5,7 @@ #include "MI_memory.h" #include "OS_cache.h" #include "OS_interrupt.h" +#include "code32.h" extern u32 cardi_rom_base; u32 cardi_rom_base; @@ -29,7 +29,7 @@ static inline BOOL CARDi_OnReadPageDirect(CARDRomStat *arg) return (p->len > 0); } -ARM_FUNC static BOOL CARDi_ReadFromCache(CARDRomStat *p) +static BOOL CARDi_ReadFromCache(CARDRomStat *p) { CARDiCommon *c = &cardi_common; const u32 cur_page = CARD_ALIGN_HI_BIT(c->src); @@ -49,7 +49,7 @@ ARM_FUNC static BOOL CARDi_ReadFromCache(CARDRomStat *p) return (c->len > 0); } -ARM_FUNC static void CARDi_SetRomOp(u32 cmd1, u32 cmd2) +static void CARDi_SetRomOp(u32 cmd1, u32 cmd2) { while ((reg_CARD_CNT & CARD_START) != 0) {} @@ -72,7 +72,7 @@ static inline void CARDi_SetRomOpReadPage1(u32 src) CARDi_SetRomOp((u32)(MROMOP_G_READ_PAGE | (src >> 8)), (u32)(src << 24)); } -ARM_FUNC static void CARDi_SetCardDma(void) +static void CARDi_SetCardDma(void) { CARDiCommon *const c = &cardi_common; CARDRomStat *const p = &rom_stat; @@ -81,7 +81,7 @@ ARM_FUNC static void CARDi_SetCardDma(void) reg_CARD_CNT = p->ctrl; } -ARM_FUNC static void CARDi_OnReadCard(void) +static void CARDi_OnReadCard(void) { CARDRomStat *const p = &rom_stat; CARDiCommon *const c = &cardi_common; @@ -98,7 +98,7 @@ ARM_FUNC static void CARDi_OnReadCard(void) } } -ARM_FUNC BOOL CARDi_TryReadCardDma(CARDRomStat *p) +BOOL CARDi_TryReadCardDma(CARDRomStat *p) { CARDiCommon *const c = &cardi_common; const u32 dst = c->dst; @@ -135,7 +135,7 @@ ARM_FUNC BOOL CARDi_TryReadCardDma(CARDRomStat *p) return is_async; } -ARM_FUNC void CARDi_ReadCard(CARDRomStat *p) +void CARDi_ReadCard(CARDRomStat *p) { CARDiCommon *const c = &cardi_common; while (TRUE) @@ -191,7 +191,7 @@ ARM_FUNC void CARDi_ReadCard(CARDRomStat *p) } } -ARM_FUNC u32 CARDi_ReadRomIDCore(void) +u32 CARDi_ReadRomIDCore(void) { CARDi_SetRomOp(MROMOP_G_READ_ID, 0); reg_CARD_CNT = (u32)(CARDi_GetRomFlag(CARD_COMMAND_ID) & ~CARD_LATENCY1_MASK); @@ -199,7 +199,7 @@ ARM_FUNC u32 CARDi_ReadRomIDCore(void) return reg_CARD_DATA; } -ARM_FUNC static void CARDi_ReadRomSyncCore(CARDiCommon *c) +static void CARDi_ReadRomSyncCore(CARDiCommon *c) { #pragma unused(c) CARDRomStat *const p = &rom_stat; @@ -211,7 +211,7 @@ ARM_FUNC static void CARDi_ReadRomSyncCore(CARDiCommon *c) CARDi_ReadEnd(); } -ARM_FUNC void CARDi_ReadRom(u32 dma, const void *src, void *dst, u32 len, MIDmaCallback callback, void *arg, BOOL is_async) +void CARDi_ReadRom(u32 dma, const void *src, void *dst, u32 len, MIDmaCallback callback, void *arg, BOOL is_async) { CARDRomStat *const p = &rom_stat; CARDiCommon *const c = &cardi_common; @@ -247,7 +247,7 @@ ARM_FUNC void CARDi_ReadRom(u32 dma, const void *src, void *dst, u32 len, MIDmaC } } -ARM_FUNC void CARD_Init(void) +void CARD_Init(void) { CARDiCommon *const p = &cardi_common; @@ -269,12 +269,12 @@ ARM_FUNC void CARD_Init(void) } } -ARM_FUNC void CARD_WaitRomAsync(void) +void CARD_WaitRomAsync(void) { (void)CARDi_WaitAsync(); } -ARM_FUNC void (*CARDi_GetRomAccessor(void)) (CARDRomStat *) +void (*CARDi_GetRomAccessor(void)) (CARDRomStat *) { return CARDi_ReadCard; } diff --git a/arm9/lib/NitroSDK/src/CARD_spi.c b/arm9/lib/NitroSDK/src/CARD_spi.c index 5f02b2766..cf3782b7e 100644 --- a/arm9/lib/NitroSDK/src/CARD_spi.c +++ b/arm9/lib/NitroSDK/src/CARD_spi.c @@ -1,12 +1,12 @@ -#include "function_target.h" #include "nitro/types.h" #include "CARD_common.h" #include "CARD_spi.h" #include "MI_memory.h" +#include "code32.h" extern CARDiCommon cardi_common; -ARM_FUNC void CARDi_IdentifyBackupCore(CARDBackupType type) +void CARDi_IdentifyBackupCore(CARDBackupType type) { CARDiCommandArg *const p = cardi_common.cmd; diff --git a/arm9/lib/NitroSDK/src/CP_context.c b/arm9/lib/NitroSDK/src/CP_context.c index 6567f516f..b7d4cf4f3 100644 --- a/arm9/lib/NitroSDK/src/CP_context.c +++ b/arm9/lib/NitroSDK/src/CP_context.c @@ -1,8 +1,8 @@ #include "CP_context.h" -#include "function_target.h" #include "registers.h" +#include "code32.h" -ARM_FUNC asm void CP_SaveContext(register CPContext *context) +asm void CP_SaveContext(register CPContext *context) { ldr r1, =REG_DIV_NUMER_ADDR stmfd sp!, {r4} @@ -24,7 +24,7 @@ ARM_FUNC asm void CP_SaveContext(register CPContext *context) bx lr } -ARM_FUNC asm void CPi_RestoreContext(register const CPContext *context) +asm void CPi_RestoreContext(register const CPContext *context) { stmfd sp!, {r4} ldr r1, =REG_DIV_NUMER_ADDR diff --git a/arm9/lib/NitroSDK/src/CTRDG_backup.c b/arm9/lib/NitroSDK/src/CTRDG_backup.c index dc1a3f4be..d2b8c8f9a 100644 --- a/arm9/lib/NitroSDK/src/CTRDG_backup.c +++ b/arm9/lib/NitroSDK/src/CTRDG_backup.c @@ -1,6 +1,6 @@ #include "CTRDG_backup.h" -#include "function_target.h" #include "OS_spinLock.h" +#include "code32.h" extern u16 ctrdgi_flash_lock_id; extern u16 ctrdgi_sram_lock_id; @@ -33,7 +33,7 @@ static const u16 readidtime[] = { 20 }; -ARM_FUNC u16 CTRDG_IdentifyAgbBackup(CTRDGBackupType type) +u16 CTRDG_IdentifyAgbBackup(CTRDGBackupType type) { u16 result = 1; u16 flashID; diff --git a/arm9/lib/NitroSDK/src/CTRDG_common.c b/arm9/lib/NitroSDK/src/CTRDG_common.c index df3ec0b6c..7f8bbaea2 100644 --- a/arm9/lib/NitroSDK/src/CTRDG_common.c +++ b/arm9/lib/NitroSDK/src/CTRDG_common.c @@ -1,5 +1,4 @@ #include "CTRDG_common.h" -#include "function_target.h" #include "syscall.h" #include "OS_cache.h" #include "OS_protectionRegion.h" @@ -8,36 +7,37 @@ #include "MI_dma.h" #include "MI_memory.h" #include "mmap.h" +#include "code32.h" CTRDGWork CTRDGi_Work; static BOOL CTRDGi_EnableFlag = FALSE; -ARM_FUNC void CTRDGi_InitCommon(void) +void CTRDGi_InitCommon(void) { SVC_CpuClear(0, &CTRDGi_Work, sizeof(CTRDGi_Work), 32); CTRDGi_Work.lockID = (u16)OS_GetLockID(); } -ARM_FUNC BOOL CTRDG_IsAgbCartridge(void) +BOOL CTRDG_IsAgbCartridge(void) { return (CTRDG_IsExisting() && CTRDGi_IsAgbCartridgeAtInit()); } -ARM_FUNC BOOL CTRDG_IsOptionCartridge(void) +BOOL CTRDG_IsOptionCartridge(void) { return (CTRDG_IsExisting() && !CTRDGi_IsAgbCartridgeAtInit()); } -ARM_FUNC BOOL CTRDGi_IsAgbCartridgeAtInit(void) +BOOL CTRDGi_IsAgbCartridgeAtInit(void) { CTRDGModuleInfo *cip = CTRDGi_GetModuleInfoAddr(); return cip->isAgbCartridge; } -ARM_FUNC u32 CTRDG_GetAgbGameCode(void) +u32 CTRDG_GetAgbGameCode(void) { u32 ret = 0; @@ -49,7 +49,7 @@ ARM_FUNC u32 CTRDG_GetAgbGameCode(void) return ret; } -ARM_FUNC u32 CTRDGi_GetAgbGameCodeAtInit(void) +u32 CTRDGi_GetAgbGameCodeAtInit(void) { CTRDGModuleInfo *cip = CTRDGi_GetModuleInfoAddr(); u32 ret = 0; @@ -62,7 +62,7 @@ ARM_FUNC u32 CTRDGi_GetAgbGameCodeAtInit(void) return ret; } -ARM_FUNC u16 CTRDG_GetAgbMakerCode(void) +u16 CTRDG_GetAgbMakerCode(void) { u16 ret = 0; @@ -74,7 +74,7 @@ ARM_FUNC u16 CTRDG_GetAgbMakerCode(void) return ret; } -ARM_FUNC u16 CTRDGi_GetAgbMakerCodeAtInit(void) +u16 CTRDGi_GetAgbMakerCodeAtInit(void) { CTRDGModuleInfo *cip = CTRDGi_GetModuleInfoAddr(); u16 ret = 0; @@ -87,7 +87,7 @@ ARM_FUNC u16 CTRDGi_GetAgbMakerCodeAtInit(void) return ret; } -ARM_FUNC BOOL CTRDG_IsPulledOut(void) +BOOL CTRDG_IsPulledOut(void) { CTRDGModuleInfo *cip = CTRDGi_GetModuleInfoAddr(); @@ -104,7 +104,7 @@ ARM_FUNC BOOL CTRDG_IsPulledOut(void) return cip->detectPullOut; } -ARM_FUNC BOOL CTRDG_IsExisting(void) +BOOL CTRDG_IsExisting(void) { BOOL ret = TRUE; CTRDGLockByProc lockInfo; @@ -144,7 +144,7 @@ ARM_FUNC BOOL CTRDG_IsExisting(void) return ret; } -ARM_FUNC void CTRDGi_ChangeLatestAccessCycle(CTRDGRomCycle *r) +void CTRDGi_ChangeLatestAccessCycle(CTRDGRomCycle *r) { r->c1 = MI_GetCartridgeRomCycle1st(); r->c2 = MI_GetCartridgeRomCycle2nd(); @@ -153,13 +153,13 @@ ARM_FUNC void CTRDGi_ChangeLatestAccessCycle(CTRDGRomCycle *r) MI_SetCartridgeRomCycle2nd(MI_CTRDG_ROMCYCLE2_6); } -ARM_FUNC void CTRDGi_RestoreAccessCycle(CTRDGRomCycle *r) +void CTRDGi_RestoreAccessCycle(CTRDGRomCycle *r) { MI_SetCartridgeRomCycle1st(r->c1); MI_SetCartridgeRomCycle2nd(r->c2); } -ARM_FUNC void CTRDGi_LockByProcessor(u16 lockID, CTRDGLockByProc *info) +void CTRDGi_LockByProcessor(u16 lockID, CTRDGLockByProc *info) { while (TRUE) { @@ -175,7 +175,7 @@ ARM_FUNC void CTRDGi_LockByProcessor(u16 lockID, CTRDGLockByProc *info) } } -ARM_FUNC void CTRDGi_UnlockByProcessor(u16 lockID, CTRDGLockByProc *info) +void CTRDGi_UnlockByProcessor(u16 lockID, CTRDGLockByProc *info) { if (!info->locked) { @@ -185,7 +185,7 @@ ARM_FUNC void CTRDGi_UnlockByProcessor(u16 lockID, CTRDGLockByProc *info) (void)OS_RestoreInterrupts(info->irq); } -ARM_FUNC void CTRDGi_SendtoPxi(u32 data) +void CTRDGi_SendtoPxi(u32 data) { while (PXI_SendWordByFifo(PXI_FIFO_TAG_CTRDG, data, FALSE) != PXI_FIFO_SUCCESS) { @@ -193,7 +193,7 @@ ARM_FUNC void CTRDGi_SendtoPxi(u32 data) } } -ARM_FUNC BOOL CTRDG_CpuCopy8(const void *src, void *dest, u32 size) +BOOL CTRDG_CpuCopy8(const void *src, void *dest, u32 size) { if (HW_CTRDG_ROM <= (u32)dest && (u32)dest < HW_CTRDG_RAM_END) { @@ -205,17 +205,17 @@ ARM_FUNC BOOL CTRDG_CpuCopy8(const void *src, void *dest, u32 size) } } -ARM_FUNC BOOL CTRDG_CpuCopy16(const void *src, void *dest, u32 size) +BOOL CTRDG_CpuCopy16(const void *src, void *dest, u32 size) { return CTRDGi_CopyCommon(0, src, dest, size, CTRDGi_FORWARD_CPU16); } -ARM_FUNC BOOL CTRDG_CpuCopy32(const void *src, void *dest, u32 size) +BOOL CTRDG_CpuCopy32(const void *src, void *dest, u32 size) { return CTRDGi_CopyCommon(0, src, dest, size, CTRDGi_FORWARD_CPU32); } -ARM_FUNC BOOL CTRDGi_CopyCommon(u32 dmaNo, const void *src, void *dest, u32 size, u32 forwardType) +BOOL CTRDGi_CopyCommon(u32 dmaNo, const void *src, void *dest, u32 size, u32 forwardType) { if (!CTRDG_IsExisting()) { @@ -267,12 +267,12 @@ ARM_FUNC BOOL CTRDGi_CopyCommon(u32 dmaNo, const void *src, void *dest, u32 size return TRUE; } -ARM_FUNC BOOL CTRDG_Read32(const u32 *address, u32 *rdata) +BOOL CTRDG_Read32(const u32 *address, u32 *rdata) { return CTRDGi_AccessCommon((void *)address, 0, rdata, CTRDGi_ACCESS_READ32); } -ARM_FUNC BOOL CTRDGi_AccessCommon(void *address, u32 data, void *rdata, u32 accessType) +BOOL CTRDGi_AccessCommon(void *address, u32 data, void *rdata, u32 accessType) { if (!CTRDG_IsExisting()) { @@ -324,12 +324,12 @@ ARM_FUNC BOOL CTRDGi_AccessCommon(void *address, u32 data, void *rdata, u32 acce return TRUE; } -ARM_FUNC BOOL CTRDG_IsEnabled(void) +BOOL CTRDG_IsEnabled(void) { return CTRDGi_EnableFlag; } -ARM_FUNC void CTRDG_Enable(BOOL enable) +void CTRDG_Enable(BOOL enable) { OSIntrMode bak_cpsr = OS_DisableInterrupts(); CTRDGi_EnableFlag = enable; @@ -341,7 +341,7 @@ ARM_FUNC void CTRDG_Enable(BOOL enable) (void)OS_RestoreInterrupts(bak_cpsr); } -ARM_FUNC void CTRDG_CheckEnabled(void) +void CTRDG_CheckEnabled(void) { if (!CTRDG_IsOptionCartridge() && !CTRDG_IsEnabled()) { diff --git a/arm9/lib/NitroSDK/src/CTRDG_flash_AT29LV512.c b/arm9/lib/NitroSDK/src/CTRDG_flash_AT29LV512.c index b1d097387..0f683f443 100644 --- a/arm9/lib/NitroSDK/src/CTRDG_flash_AT29LV512.c +++ b/arm9/lib/NitroSDK/src/CTRDG_flash_AT29LV512.c @@ -1,10 +1,10 @@ #include "CTRDG_flash_AT29LV512.h" -#include "function_target.h" #include "CTRDG_backup.h" #include "CTRDG_flash.h" #include "MI_exMemory.h" #include "OS_interrupt.h" #include "OS_spinLock.h" +#include "code32.h" #define CTRDG_BACKUP_COM_ADR1 (CTRDG_AGB_FLASH_ADR+0x00005555) #define CTRDG_BACKUP_COM_ADR2 (CTRDG_AGB_FLASH_ADR+0x00002aaa) @@ -25,42 +25,52 @@ static const u16 atMaxTime[] = { }; const CTRDGiFlashTypePlus AT29LV512_lib = { - CTRDGi_WriteFlash4KBAT, - CTRDGi_EraseFlashChipAT, - CTRDGi_EraseFlash4KBAT, - CTRDGi_WriteFlash4KBAsyncAT, - CTRDGi_EraseFlashChipAsyncAT, - CTRDGi_EraseFlash4KBAsyncAT, - CTRDGi_PollingSR512kCOMMON, - atMaxTime, - { - 0x00010000, //ROM size - {0x00001000, 12, 16, 0}, //sector - {MI_CTRDG_RAMCYCLE_18, MI_CTRDG_RAMCYCLE_18}, //read cycle and write cycle - 0x1f, //maker ID - 0x3d, //device ID + .CTRDGi_WriteAgbFlashSector = CTRDGi_WriteFlash4KBAT, + .CTRDGi_EraseAgbFlashChip = CTRDGi_EraseFlashChipAT, + .CTRDGi_EraseAgbFlashSector = CTRDGi_EraseFlash4KBAT, + .CTRDGi_WriteAgbFlashSectorAsync = CTRDGi_WriteFlash4KBAsyncAT, + .CTRDGi_EraseAgbFlashChipAsync = CTRDGi_EraseFlashChipAsyncAT, + .CTRDGi_EraseAgbFlashSectorAsync = CTRDGi_EraseFlash4KBAsyncAT, + .CTRDGi_PollingSR = CTRDGi_PollingSR512kCOMMON, + .maxtime = atMaxTime, + .type = { + .romSize = 0x00010000, + .sector = { + .size = 0x00001000, + .shift = 12, + .count = 16, + .top = 0 + }, + .agbWait = {MI_CTRDG_RAMCYCLE_18, MI_CTRDG_RAMCYCLE_18}, //read cycle and write cycle + .makerID = 0x1f, + .deviceID = 0x3d, } }; const CTRDGiFlashTypePlus AT29LV512_org = { - CTRDGi_WriteFlashSectorAT, - CTRDGi_EraseFlashChipAT, - CTRDGi_EraseFlashSectorAT, - CTRDGi_WriteFlashSectorAsyncAT, - CTRDGi_EraseFlashChipAsyncAT, - CTRDGi_EraseFlashSectorAsyncAT, - CTRDGi_PollingSR512kCOMMON, - atMaxTime, - { - 0x00010000, //ROM size - {0x00000080, 7, 512, 0}, //sector - {MI_CTRDG_RAMCYCLE_18, MI_CTRDG_RAMCYCLE_18}, //read cycle and write cycle - 0x1f, //maker ID - 0x3d, //device ID + .CTRDGi_WriteAgbFlashSector = CTRDGi_WriteFlashSectorAT, + .CTRDGi_EraseAgbFlashChip = CTRDGi_EraseFlashChipAT, + .CTRDGi_EraseAgbFlashSector = CTRDGi_EraseFlashSectorAT, + .CTRDGi_WriteAgbFlashSectorAsync = CTRDGi_WriteFlashSectorAsyncAT, + .CTRDGi_EraseAgbFlashChipAsync = CTRDGi_EraseFlashChipAsyncAT, + .CTRDGi_EraseAgbFlashSectorAsync = CTRDGi_EraseFlashSectorAsyncAT, + .CTRDGi_PollingSR = CTRDGi_PollingSR512kCOMMON, + .maxtime = atMaxTime, + .type = { + .romSize = 0x00010000, + .sector = { + .size = 0x00000080, + .shift = 7, + .count = 512, + .top = 0 + }, + .agbWait = {MI_CTRDG_RAMCYCLE_18, MI_CTRDG_RAMCYCLE_18}, //read cycle and write cycle + .makerID = 0x1f, + .deviceID = 0x3d, } }; -ARM_FUNC u32 CTRDGi_EraseFlashChipCoreAT(CTRDGTaskInfo *arg) +u32 CTRDGi_EraseFlashChipCoreAT(CTRDGTaskInfo *arg) { MICartridgeRamCycle ram_cycle; u32 result; @@ -91,7 +101,7 @@ ARM_FUNC u32 CTRDGi_EraseFlashChipCoreAT(CTRDGTaskInfo *arg) return result; } -ARM_FUNC u32 CTRDGi_EraseFlashSectorCoreAT(CTRDGTaskInfo *arg) +u32 CTRDGi_EraseFlashSectorCoreAT(CTRDGTaskInfo *arg) { u32 i; u8 *dst; @@ -136,7 +146,7 @@ ARM_FUNC u32 CTRDGi_EraseFlashSectorCoreAT(CTRDGTaskInfo *arg) return result; } -ARM_FUNC u32 CTRDGi_EraseFlash4KBCoreAT(CTRDGTaskInfo *arg) +u32 CTRDGi_EraseFlash4KBCoreAT(CTRDGTaskInfo *arg) { u32 result; u16 i, p_secNo, retry; @@ -169,7 +179,7 @@ ARM_FUNC u32 CTRDGi_EraseFlash4KBCoreAT(CTRDGTaskInfo *arg) return result; } -ARM_FUNC u32 CTRDGi_WriteFlashSectorCoreAT(CTRDGTaskInfo *arg) +u32 CTRDGi_WriteFlashSectorCoreAT(CTRDGTaskInfo *arg) { u32 i; u8 *dst; @@ -211,7 +221,7 @@ ARM_FUNC u32 CTRDGi_WriteFlashSectorCoreAT(CTRDGTaskInfo *arg) return result; } -ARM_FUNC u32 CTRDGi_WriteFlash4KBCoreAT(CTRDGTaskInfo *arg) +u32 CTRDGi_WriteFlash4KBCoreAT(CTRDGTaskInfo *arg) { u32 result; u16 p_secNo, retry; @@ -248,20 +258,20 @@ ARM_FUNC u32 CTRDGi_WriteFlash4KBCoreAT(CTRDGTaskInfo *arg) return result; } -ARM_FUNC u16 CTRDGi_EraseFlashChipAT(void) +u16 CTRDGi_EraseFlashChipAT(void) { CTRDGTaskInfo p; return (u16)CTRDGi_EraseFlashChipCoreAT(&p); } -ARM_FUNC u16 CTRDGi_EraseFlash4KBAT(u16 l_secNo) +u16 CTRDGi_EraseFlash4KBAT(u16 l_secNo) { CTRDGTaskInfo p; p.sec_num = l_secNo; return (u16)CTRDGi_EraseFlash4KBCoreAT(&p); } -ARM_FUNC u16 CTRDGi_WriteFlash4KBAT(u16 l_secNo, u8 *src) +u16 CTRDGi_WriteFlash4KBAT(u16 l_secNo, u8 *src) { CTRDGTaskInfo p; p.sec_num = l_secNo; @@ -269,14 +279,14 @@ ARM_FUNC u16 CTRDGi_WriteFlash4KBAT(u16 l_secNo, u8 *src) return (u16)CTRDGi_WriteFlash4KBCoreAT(&p); } -ARM_FUNC void CTRDGi_EraseFlashChipAsyncAT(CTRDG_TASK_FUNC callback) +void CTRDGi_EraseFlashChipAsyncAT(CTRDG_TASK_FUNC callback) { CTRDGTaskInfo p; CTRDGi_SetTask(&p, CTRDGi_EraseFlashChipCoreAT, callback); } -ARM_FUNC void CTRDGi_EraseFlash4KBAsyncAT(u16 l_secNo, CTRDG_TASK_FUNC callback) +void CTRDGi_EraseFlash4KBAsyncAT(u16 l_secNo, CTRDG_TASK_FUNC callback) { CTRDGTaskInfo p; @@ -284,7 +294,7 @@ ARM_FUNC void CTRDGi_EraseFlash4KBAsyncAT(u16 l_secNo, CTRDG_TASK_FUNC callback) CTRDGi_SetTask(&p, CTRDGi_EraseFlash4KBCoreAT, callback); } -ARM_FUNC void CTRDGi_WriteFlash4KBAsyncAT(u16 l_secNo, u8 *src, CTRDG_TASK_FUNC callback) +void CTRDGi_WriteFlash4KBAsyncAT(u16 l_secNo, u8 *src, CTRDG_TASK_FUNC callback) { CTRDGTaskInfo p; @@ -293,14 +303,14 @@ ARM_FUNC void CTRDGi_WriteFlash4KBAsyncAT(u16 l_secNo, u8 *src, CTRDG_TASK_FUNC CTRDGi_SetTask(&p, CTRDGi_WriteFlash4KBCoreAT, callback); } -ARM_FUNC u16 CTRDGi_EraseFlashSectorAT(u16 p_secNo) +u16 CTRDGi_EraseFlashSectorAT(u16 p_secNo) { CTRDGTaskInfo p; p.sec_num = p_secNo; return (u16)CTRDGi_EraseFlashSectorCoreAT(&p); } -ARM_FUNC u16 CTRDGi_WriteFlashSectorAT(u16 p_secNo, u8 *src) +u16 CTRDGi_WriteFlashSectorAT(u16 p_secNo, u8 *src) { CTRDGTaskInfo p; @@ -309,7 +319,7 @@ ARM_FUNC u16 CTRDGi_WriteFlashSectorAT(u16 p_secNo, u8 *src) return (u16)CTRDGi_WriteFlashSectorCoreAT(&p); } -ARM_FUNC void CTRDGi_EraseFlashSectorAsyncAT(u16 p_secNo, CTRDG_TASK_FUNC callback) +void CTRDGi_EraseFlashSectorAsyncAT(u16 p_secNo, CTRDG_TASK_FUNC callback) { CTRDGTaskInfo p; @@ -317,7 +327,7 @@ ARM_FUNC void CTRDGi_EraseFlashSectorAsyncAT(u16 p_secNo, CTRDG_TASK_FUNC callba CTRDGi_SetTask(&p, CTRDGi_EraseFlashSectorCoreAT, callback); } -ARM_FUNC void CTRDGi_WriteFlashSectorAsyncAT(u16 p_secNo, u8 *src, CTRDG_TASK_FUNC callback) +void CTRDGi_WriteFlashSectorAsyncAT(u16 p_secNo, u8 *src, CTRDG_TASK_FUNC callback) { CTRDGTaskInfo p; diff --git a/arm9/lib/NitroSDK/src/FS_archive.c b/arm9/lib/NitroSDK/src/FS_archive.c index 01f794f8b..d33488010 100644 --- a/arm9/lib/NitroSDK/src/FS_archive.c +++ b/arm9/lib/NitroSDK/src/FS_archive.c @@ -4,11 +4,12 @@ #include "MI_memory.h" #include "MI_byteAccess.h" #include "OS_printf.h" +#include "code32.h" FSArchive * arc_list = NULL; FSDirPos current_dir_pos; -ARM_FUNC u32 FSi_GetPackedName(const char * name, int name_len) +u32 FSi_GetPackedName(const char * name, int name_len) { u32 ret = 0; if (name_len <= FS_ARCHIVE_NAME_LEN_MAX) @@ -30,26 +31,26 @@ ARM_FUNC u32 FSi_GetPackedName(const char * name, int name_len) return ret; } -ARM_FUNC FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size) +FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size) { MI_CpuCopy8((const void *)FS_GetArchiveOffset(p_arc, pos), dest, size); return FS_RESULT_SUCCESS; } -ARM_FUNC FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size) +FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size) { MI_CpuCopy8(src, (void *)FS_GetArchiveOffset(p_arc, pos), size); return FS_RESULT_SUCCESS; } -ARM_FUNC FSResult FSi_ReadMemoryCore(FSArchive * p_arc, void * dest, u32 pos, u32 size) +FSResult FSi_ReadMemoryCore(FSArchive * p_arc, void * dest, u32 pos, u32 size) { #pragma unused(p_arc) MI_CpuCopy8((const void *)pos, dest, size); return FS_RESULT_SUCCESS; } -ARM_FUNC FSFile * FSi_NextCommand(FSArchive * p_arc) +FSFile * FSi_NextCommand(FSArchive * p_arc) { OSIntrMode bak_psr = OS_DisableInterrupts(); if (FSi_IsArchiveCanceling(p_arc)) @@ -116,7 +117,7 @@ ARM_FUNC FSFile * FSi_NextCommand(FSArchive * p_arc) return NULL; } -ARM_FUNC void FSi_ExecuteAsyncCommand(FSFile * p_file) +void FSi_ExecuteAsyncCommand(FSFile * p_file) { FSArchive *const p_arc = p_file->arc; while (p_file) @@ -137,7 +138,7 @@ ARM_FUNC void FSi_ExecuteAsyncCommand(FSFile * p_file) } } -ARM_FUNC BOOL FSi_ExecuteSyncCommand(FSFile * p_file) +BOOL FSi_ExecuteSyncCommand(FSFile * p_file) { FSFile * p_target; FSResult ret = FSi_TranslateCommand(p_file, p_file->command); @@ -148,7 +149,7 @@ ARM_FUNC BOOL FSi_ExecuteSyncCommand(FSFile * p_file) return FS_IsSucceeded(p_file); } -ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command) +BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command) { FSArchive * p_arc = p_file->arc; const int bit = 1 << command; @@ -199,14 +200,14 @@ ARM_FUNC BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command) return FSi_ExecuteSyncCommand(p_file); } -ARM_FUNC void FS_InitArchive(FSArchive * p_arc) +void FS_InitArchive(FSArchive * p_arc) { MI_CpuClear8(p_arc, sizeof(FSArchive)); p_arc->sync_q.head = p_arc->sync_q.tail = NULL; p_arc->stat_q.head = p_arc->stat_q.tail = NULL; } -ARM_FUNC FSArchive * const FS_FindArchive(const char * name, int name_len) +FSArchive * const FS_FindArchive(const char * name, int name_len) { u32 pack = FSi_GetPackedName(name, name_len); OSIntrMode bak_psr = OS_DisableInterrupts(); @@ -217,7 +218,7 @@ ARM_FUNC FSArchive * const FS_FindArchive(const char * name, int name_len) return p_arc; } -ARM_FUNC BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len) +BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len) { BOOL ret = FALSE; OSIntrMode bak_psr = OS_DisableInterrupts(); @@ -247,7 +248,7 @@ ARM_FUNC BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int n return ret; } -ARM_FUNC void FS_ReleaseArchiveName(FSArchive * p_arc) +void FS_ReleaseArchiveName(FSArchive * p_arc) { if (p_arc->name.pack) { @@ -270,7 +271,7 @@ ARM_FUNC void FS_ReleaseArchiveName(FSArchive * p_arc) } } -ARM_FUNC BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt, u32 fnt_size, FS_ARCHIVE_READ_FUNC read_func, FS_ARCHIVE_WRITE_FUNC write_func) +BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt, u32 fnt_size, FS_ARCHIVE_READ_FUNC read_func, FS_ARCHIVE_WRITE_FUNC write_func) { p_arc->base = base; p_arc->fat_size = fat_size; @@ -285,7 +286,7 @@ ARM_FUNC BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, return TRUE; } -ARM_FUNC BOOL FS_UnloadArchive(FSArchive * p_arc) +BOOL FS_UnloadArchive(FSArchive * p_arc) { OSIntrMode bak_psr = OS_DisableInterrupts(); if (FS_IsArchiveLoaded(p_arc)) @@ -319,7 +320,7 @@ ARM_FUNC BOOL FS_UnloadArchive(FSArchive * p_arc) return TRUE; } -ARM_FUNC u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size) +u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size) { u32 total_size = ALIGN_BYTE(p_arc->fat_size + p_arc->fnt_size + 32, 32); if (total_size <= max_size) @@ -353,7 +354,7 @@ ARM_FUNC u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size) return total_size; } -ARM_FUNC void * FS_UnloadArchiveTables(FSArchive * p_arc) +void * FS_UnloadArchiveTables(FSArchive * p_arc) { void *ret = NULL; if (FS_IsArchiveLoaded(p_arc)) @@ -374,7 +375,7 @@ ARM_FUNC void * FS_UnloadArchiveTables(FSArchive * p_arc) return ret; } -ARM_FUNC BOOL FS_SuspendArchive(FSArchive * p_arc) +BOOL FS_SuspendArchive(FSArchive * p_arc) { OSIntrMode bak_psr = OS_DisableInterrupts(); const BOOL bak_stat = !FS_IsArchiveSuspended(p_arc); @@ -396,7 +397,7 @@ ARM_FUNC BOOL FS_SuspendArchive(FSArchive * p_arc) return bak_stat; } -ARM_FUNC BOOL FS_ResumeArchive(FSArchive * p_arc) +BOOL FS_ResumeArchive(FSArchive * p_arc) { FSFile * p_target = NULL; OSIntrMode bak_psr = OS_DisableInterrupts(); @@ -412,7 +413,7 @@ ARM_FUNC BOOL FS_ResumeArchive(FSArchive * p_arc) return bak_stat; } -ARM_FUNC void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags) +void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags) { if (!flags) proc = NULL; @@ -422,7 +423,7 @@ ARM_FUNC void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC p p_arc->proc_flag = flags; } -ARM_FUNC void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret) +void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret) { if (FSi_IsArchiveAsync(p_arc)) { diff --git a/arm9/lib/NitroSDK/src/FS_command.c b/arm9/lib/NitroSDK/src/FS_command.c index e677f6c61..05cb4d0c5 100644 --- a/arm9/lib/NitroSDK/src/FS_command.c +++ b/arm9/lib/NitroSDK/src/FS_command.c @@ -2,8 +2,9 @@ #include "FS_archive.h" #include "FSi_util.h" #include "FS_command.h" +#include "code32.h" -ARM_FUNC void FSi_ReleaseCommand(FSFile * p_file, FSResult ret) +void FSi_ReleaseCommand(FSFile * p_file, FSResult ret) { OSIntrMode bak_psr = OS_DisableInterrupts(); FSi_CutFromList(p_file); @@ -13,7 +14,7 @@ ARM_FUNC void FSi_ReleaseCommand(FSFile * p_file, FSResult ret) (void)OS_RestoreInterrupts(bak_psr); } -ARM_FUNC FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command) +FSResult FSi_TranslateCommand(FSFile *p_file, FSCommandType command) { FSResult ret; diff --git a/arm9/lib/NitroSDK/src/FS_command_default.c b/arm9/lib/NitroSDK/src/FS_command_default.c index 0cdc91fc7..706921a15 100644 --- a/arm9/lib/NitroSDK/src/FS_command_default.c +++ b/arm9/lib/NitroSDK/src/FS_command_default.c @@ -5,6 +5,7 @@ #include "MI_memory.h" #include "FSi_util.h" #include "FS_command_default.h" +#include "code32.h" FSResult (*const fsi_default_command[])(FSFile *) = { [FS_COMMAND_READFILE] = FSi_ReadFileCommand, @@ -19,7 +20,7 @@ FSResult (*const fsi_default_command[])(FSFile *) = { }; // Case-insensitive string comparison -ARM_FUNC u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len) +u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len) { int i; for (i = 0; i < len; i++) @@ -36,7 +37,7 @@ ARM_FUNC u32 FSi_StrNICmp(const char * str1, const char * str2, u32 len) return 0; } -ARM_FUNC FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len) +FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len) { FSResult ret; FSArchive * const p_arc = p->arc; @@ -62,7 +63,7 @@ ARM_FUNC FSResult FSi_ReadTable(FSiSyncReadParam * p, void * dst, u32 len) return ret; } -ARM_FUNC FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id) +FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id) { p_dir->stat |= FS_FILE_STATUS_SYNC; p_dir->arg.seekdir.pos.arc = p_dir->arc; @@ -73,7 +74,7 @@ ARM_FUNC FSResult FSi_SeekDirDirect(FSFile * p_dir, u32 id) } // The actual commands -ARM_FUNC FSResult FSi_ReadFileCommand(FSFile * p_file) +FSResult FSi_ReadFileCommand(FSFile * p_file) { FSArchive *const p_arc = p_file->arc; const u32 pos = p_file->prop.file.pos; @@ -83,7 +84,7 @@ ARM_FUNC FSResult FSi_ReadFileCommand(FSFile * p_file) return (*p_arc->read_func)(p_arc, dst, pos, len); } -ARM_FUNC FSResult FSi_WriteFileCommand(FSFile * p_file) +FSResult FSi_WriteFileCommand(FSFile * p_file) { FSArchive *const p_arc = p_file->arc; const u32 pos = p_file->prop.file.pos; @@ -93,7 +94,7 @@ ARM_FUNC FSResult FSi_WriteFileCommand(FSFile * p_file) return (*p_arc->write_func)(p_arc, src, pos, len); } -ARM_FUNC FSResult FSi_SeekDirCommand(FSFile * p_dir) +FSResult FSi_SeekDirCommand(FSFile * p_dir) { FSResult ret; FSArchive *const p_arc = p_dir->arc; @@ -117,7 +118,7 @@ ARM_FUNC FSResult FSi_SeekDirCommand(FSFile * p_dir) return ret; } -ARM_FUNC FSResult FSi_ReadDirCommand(FSFile *p_dir) +FSResult FSi_ReadDirCommand(FSFile *p_dir) { FSDirEntry *p_entry = p_dir->arg.readdir.p_entry; FSResult ret; @@ -171,7 +172,7 @@ ARM_FUNC FSResult FSi_ReadDirCommand(FSFile *p_dir) return ret; } -ARM_FUNC FSResult FSi_FindPathCommand(FSFile *p_dir) +FSResult FSi_FindPathCommand(FSFile *p_dir) { const char *path = p_dir->arg.findpath.path; const BOOL is_dir = p_dir->arg.findpath.find_directory; @@ -246,7 +247,7 @@ ARM_FUNC FSResult FSi_FindPathCommand(FSFile *p_dir) return FS_RESULT_SUCCESS; } -ARM_FUNC FSResult FSi_GetPathCommand(FSFile *p_file) +FSResult FSi_GetPathCommand(FSFile *p_file) { FSArchive *const p_arc = p_file->arc; @@ -409,7 +410,7 @@ ARM_FUNC FSResult FSi_GetPathCommand(FSFile *p_file) return FS_RESULT_SUCCESS; } -ARM_FUNC FSResult FSi_OpenFileFastCommand(FSFile * p_file) +FSResult FSi_OpenFileFastCommand(FSFile * p_file) { FSArchive *const p_arc = p_file->arc; const FSFileID *p_id = &p_file->arg.openfilefast.id; @@ -437,7 +438,7 @@ ARM_FUNC FSResult FSi_OpenFileFastCommand(FSFile * p_file) } } -ARM_FUNC FSResult FSi_OpenFileDirectCommand(FSFile * p_file) +FSResult FSi_OpenFileDirectCommand(FSFile * p_file) { p_file->prop.file.top = p_file->arg.openfiledirect.top; p_file->prop.file.pos = p_file->arg.openfiledirect.top; @@ -446,7 +447,7 @@ ARM_FUNC FSResult FSi_OpenFileDirectCommand(FSFile * p_file) return FS_RESULT_SUCCESS; } -ARM_FUNC FSResult FSi_CloseFileCommand(FSFile * p_file) +FSResult FSi_CloseFileCommand(FSFile * p_file) { #pragma unused (p_file) return FS_RESULT_SUCCESS; diff --git a/arm9/lib/NitroSDK/src/FS_file.c b/arm9/lib/NitroSDK/src/FS_file.c index 11595c022..cdcbafb5b 100644 --- a/arm9/lib/NitroSDK/src/FS_file.c +++ b/arm9/lib/NitroSDK/src/FS_file.c @@ -3,13 +3,14 @@ #include "FS_rom.h" #include "FS_file.h" #include "FSi_util.h" +#include "code32.h" extern FSDirPos current_dir_pos; BOOL is_init = FALSE; static BOOL FSi_FindPath(FSFile * p_dir, const char * path, FSFileID * p_file_id, FSDirPos * p_dir_pos); -ARM_FUNC void FS_Init(u32 default_dma_no) +void FS_Init(u32 default_dma_no) { if (!is_init) { @@ -18,12 +19,12 @@ ARM_FUNC void FS_Init(u32 default_dma_no) } } -ARM_FUNC BOOL FS_IsAvailable(void) +BOOL FS_IsAvailable(void) { return is_init; } -ARM_FUNC void FS_InitFile(FSFile * p_file) +void FS_InitFile(FSFile * p_file) { p_file->link.next = p_file->link.prev = NULL; OS_InitThreadQueue(p_file->queue); @@ -90,7 +91,7 @@ static BOOL FSi_FindPath(FSFile * p_dir, const char * path, FSFileID * p_file_id return FSi_SendCommand(p_dir, FS_COMMAND_FINDPATH); } -ARM_FUNC int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async) +int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async) { const s32 pos = (s32)p_file->prop.file.pos; const s32 rest = (s32)(p_file->prop.file.bottom - pos); @@ -115,7 +116,7 @@ ARM_FUNC int FSi_ReadFileCore(FSFile * p_file, void * dst, s32 len, BOOL async) return len; } -ARM_FUNC BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path) +BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path) { FSFile dir; FS_InitFile(&dir); @@ -124,7 +125,7 @@ ARM_FUNC BOOL FS_ConvertPathToFileID(FSFileID * p_file_id, const char * path) return TRUE; } -ARM_FUNC BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index) +BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index) { p_file->arc = p_arc; p_file->arg.openfiledirect.index = file_index; @@ -137,7 +138,7 @@ ARM_FUNC BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_to return TRUE; } -ARM_FUNC BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id) +BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id) { if (!file_id.arc) return FALSE; @@ -150,13 +151,13 @@ ARM_FUNC BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id) return TRUE; } -ARM_FUNC BOOL FS_OpenFile(FSFile * p_file, const char * path) +BOOL FS_OpenFile(FSFile * p_file, const char * path) { FSFileID file_id; return FS_ConvertPathToFileID(&file_id, path) && FS_OpenFileFast(p_file, file_id); } -ARM_FUNC BOOL FS_CloseFile(FSFile * p_file) +BOOL FS_CloseFile(FSFile * p_file) { if (!FSi_SendCommand(p_file, FS_COMMAND_CLOSEFILE)) return FALSE; @@ -166,7 +167,7 @@ ARM_FUNC BOOL FS_CloseFile(FSFile * p_file) return TRUE; } -ARM_FUNC BOOL FS_WaitAsync(FSFile * p_file) +BOOL FS_WaitAsync(FSFile * p_file) { BOOL is_owner = FALSE; OSIntrMode bak_par = OS_DisableInterrupts(); @@ -198,17 +199,17 @@ ARM_FUNC BOOL FS_WaitAsync(FSFile * p_file) return FS_IsSucceeded(p_file); } -ARM_FUNC int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len) +int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len) { return FSi_ReadFileCore(p_file, dst, len, TRUE); } -ARM_FUNC int FS_ReadFile(FSFile * p_file, void * dst, s32 len) +int FS_ReadFile(FSFile * p_file, void * dst, s32 len) { return FSi_ReadFileCore(p_file, dst, len, FALSE); } -ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, s32 offset, FSSeekFileMode origin) +BOOL FS_SeekFile(FSFile * p_file, s32 offset, FSSeekFileMode origin) { switch (origin) { @@ -232,7 +233,7 @@ ARM_FUNC BOOL FS_SeekFile(FSFile * p_file, s32 offset, FSSeekFileMode origin) return TRUE; } -ARM_FUNC BOOL FS_ChangeDir(const char * path) +BOOL FS_ChangeDir(const char * path) { FSDirPos pos; FSFile dir; diff --git a/arm9/lib/NitroSDK/src/FS_overlay.c b/arm9/lib/NitroSDK/src/FS_overlay.c index de64d97df..f66cfb2e8 100644 --- a/arm9/lib/NitroSDK/src/FS_overlay.c +++ b/arm9/lib/NitroSDK/src/FS_overlay.c @@ -10,12 +10,13 @@ #include "FS_overlay.h" #include "FS_mw_dtor.h" #include "MB_mb.h" +#include "code32.h" #define FS_OVERLAY_FLAG_COMP 0x0001 #define FS_OVERLAY_FLAG_AUTH 0x0002 #define FS_OVERLAY_DIGEST_SIZE DGT_HASH2_DIGEST_SIZE -ARM_FUNC u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi) +u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi) { u32 size = (p_ovi->header.flag & FS_OVERLAY_FLAG_COMP) ? p_ovi->header.compressed @@ -23,7 +24,7 @@ ARM_FUNC u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi) return size; } -ARM_FUNC void FS_ClearOverlayImage(FSOverlayInfo * p_ovi) +void FS_ClearOverlayImage(FSOverlayInfo * p_ovi) { u8 * const im_start = FS_GetOverlayAddress(p_ovi); u32 const ram_size = FS_GetOverlayImageSize(p_ovi); @@ -34,7 +35,7 @@ ARM_FUNC void FS_ClearOverlayImage(FSOverlayInfo * p_ovi) MI_CpuFill8(im_start + ram_size, 0, total_size - ram_size); } -ARM_FUNC FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi) +FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi) { FSFileID ret; ret.arc = &fsi_arc_rom; @@ -42,7 +43,7 @@ ARM_FUNC FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi) return ret; } -ARM_FUNC BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7) +BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7) { CARDRomRegion pr[1]; u32 pos; @@ -80,7 +81,7 @@ ARM_FUNC BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, return TRUE; } -ARM_FUNC BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id) +BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id) { CARDRomRegion * const pr = (target == MI_PROCESSOR_ARM9) ? &fsi_ovt9 : &fsi_ovt7; if (pr->offset) @@ -107,7 +108,7 @@ ARM_FUNC BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOv } } -ARM_FUNC BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file) +BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file) { FS_InitFile(p_file); if (!FS_OpenFileFast(p_file, FS_GetOverlayFileID(p_ovi))) @@ -125,7 +126,7 @@ ARM_FUNC BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file) } } -ARM_FUNC BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi) +BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi) { FSFile file[1]; FS_InitFile(file); @@ -170,7 +171,7 @@ static const u8 fsi_def_digest_key[64] = { static const void *fsi_digest_key_ptr = fsi_def_digest_key; static u32 fsi_digest_key_len = sizeof(fsi_def_digest_key); -ARM_FUNC BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, u32 len) +BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, u32 len) { int i; u8 digest[FS_OVERLAY_DIGEST_SIZE]; @@ -190,7 +191,7 @@ ARM_FUNC BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, u32 len) extern u8 SDK_OVERLAY_DIGEST[]; extern u8 SDK_OVERLAY_DIGEST_END[]; -ARM_FUNC void FS_StartOverlay(FSOverlayInfo * p_ovi) +void FS_StartOverlay(FSOverlayInfo * p_ovi) { u32 rare_size = FSi_GetOverlayBinarySize(p_ovi); if (MB_IsMultiBootChild()) @@ -230,7 +231,7 @@ ARM_FUNC void FS_StartOverlay(FSOverlayInfo * p_ovi) } } -ARM_FUNC void FS_EndOverlay(FSOverlayInfo *p_ovi) +void FS_EndOverlay(FSOverlayInfo *p_ovi) { for (;;) { @@ -296,13 +297,13 @@ ARM_FUNC void FS_EndOverlay(FSOverlayInfo *p_ovi) } } -ARM_FUNC BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi) +BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi) { FS_EndOverlay(p_ovi); return TRUE; } -ARM_FUNC BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id) +BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id) { FSOverlayInfo ovi; if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_LoadOverlayImage(&ovi)) @@ -311,7 +312,7 @@ ARM_FUNC BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id) return TRUE; } -ARM_FUNC BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id) +BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id) { FSOverlayInfo ovi; if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_UnloadOverlayImage(&ovi)) diff --git a/arm9/lib/NitroSDK/src/FS_rom.c b/arm9/lib/NitroSDK/src/FS_rom.c index 09098dfe4..b990095f1 100644 --- a/arm9/lib/NitroSDK/src/FS_rom.c +++ b/arm9/lib/NitroSDK/src/FS_rom.c @@ -6,6 +6,7 @@ #include "CARD_common.h" #include "MB_mb.h" #include "OS_printf.h" +#include "code32.h" static u32 fsi_default_dma_no; s32 fsi_card_lock_id; @@ -13,24 +14,24 @@ CARDRomRegion fsi_ovt9; CARDRomRegion fsi_ovt7; FSArchive fsi_arc_rom; -ARM_FUNC void FSi_OnRomReadDone(void * p_arc) +void FSi_OnRomReadDone(void * p_arc) { FS_NotifyArchiveAsyncEnd(p_arc, CARD_IsPulledOut() ? FS_RESULT_ERROR : FS_RESULT_SUCCESS); } -ARM_FUNC FSResult FSi_ReadRomCallback(FSArchive * p_arc, void * dst, u32 src, u32 len) +FSResult FSi_ReadRomCallback(FSArchive * p_arc, void * dst, u32 src, u32 len) { CARD_ReadRomAsync(fsi_default_dma_no, (const void *)src, dst, len, FSi_OnRomReadDone, p_arc); return FS_RESULT_PROC_ASYNC; } -ARM_FUNC FSResult FSi_WriteDummyCallback(FSArchive * p_arc, const void *src, u32 dst, u32 len) +FSResult FSi_WriteDummyCallback(FSArchive * p_arc, const void *src, u32 dst, u32 len) { #pragma unused(p_arc, src, dst, len) return FS_RESULT_FAILURE; } -ARM_FUNC FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd) +FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd) { #pragma unused(p_arc) switch (cmd) @@ -48,19 +49,19 @@ ARM_FUNC FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd) } } -ARM_FUNC FSResult FSi_ReadDummyCallback(FSArchive *p_arc, void *dst, u32 src, u32 len) +FSResult FSi_ReadDummyCallback(FSArchive *p_arc, void *dst, u32 src, u32 len) { #pragma unused (p_arc, dst, src, len) return FS_RESULT_FAILURE; } -ARM_FUNC FSResult FSi_EmptyArchiveProc(FSFile *p_file, FSCommandType cmd) +FSResult FSi_EmptyArchiveProc(FSFile *p_file, FSCommandType cmd) { #pragma unused(p_file, cmd) return FS_RESULT_UNSUPPORTED; } -ARM_FUNC void FSi_InitRom(u32 default_dma_no) +void FSi_InitRom(u32 default_dma_no) { fsi_default_dma_no = default_dma_no; fsi_card_lock_id = OS_GetLockID(); @@ -107,7 +108,7 @@ ARM_FUNC void FSi_InitRom(u32 default_dma_no) } } -ARM_FUNC u32 FS_SetDefaultDMA(u32 dma_no) +u32 FS_SetDefaultDMA(u32 dma_no) { OSIntrMode bak_psr = OS_DisableInterrupts(); u32 bak_dma_no = fsi_default_dma_no; @@ -119,7 +120,7 @@ ARM_FUNC u32 FS_SetDefaultDMA(u32 dma_no) return bak_dma_no; } -ARM_FUNC u32 FS_TryLoadTable(void * p_mem, u32 size) +u32 FS_TryLoadTable(void * p_mem, u32 size) { return FS_LoadArchiveTables(&fsi_arc_rom, p_mem, size); } diff --git a/arm9/lib/NitroSDK/src/FX.c b/arm9/lib/NitroSDK/src/FX.c index ea7305383..9055b7a71 100644 --- a/arm9/lib/NitroSDK/src/FX.c +++ b/arm9/lib/NitroSDK/src/FX.c @@ -1,11 +1,12 @@ -#include "global.h" +#include "nitro/types.h" #include "fx.h" +#include "code32.h" -ARM_FUNC void FX_Init(){ +void FX_Init() { return; } -ARM_FUNC fx32 FX_Modf(fx32 x, fx32 *iptr){ +fx32 FX_Modf(fx32 x, fx32 *iptr) { if (x >= 0) { *iptr = x & 0x7FFFF000; diff --git a/arm9/lib/NitroSDK/src/FX_atan.c b/arm9/lib/NitroSDK/src/FX_atan.c index ef2a662d6..ca5976e94 100644 --- a/arm9/lib/NitroSDK/src/FX_atan.c +++ b/arm9/lib/NitroSDK/src/FX_atan.c @@ -1,5 +1,6 @@ -#include "global.h" +#include "nitro/types.h" #include "fx.h" +#include "code32.h" const fx16 FX_AtanTable_[] = { FX16_CONST(0.0), @@ -133,7 +134,7 @@ const fx16 FX_AtanTable_[] = { FX16_CONST(2.0), }; -ARM_FUNC u16 FX_Atan(fx32 x){ +u16 FX_Atan(fx32 x){ if (x >= 0) { if (x > 0x1000) @@ -170,7 +171,7 @@ ARM_FUNC u16 FX_Atan(fx32 x){ } } -ARM_FUNC u16 FX_Atan2(fx32 x, fx32 y){ +u16 FX_Atan2(fx32 x, fx32 y){ u32 positive, bias, denominator, numerator; if (x > 0) { diff --git a/arm9/lib/NitroSDK/src/FX_cp.c b/arm9/lib/NitroSDK/src/FX_cp.c index 0c5d4ff88..555df234e 100644 --- a/arm9/lib/NitroSDK/src/FX_cp.c +++ b/arm9/lib/NitroSDK/src/FX_cp.c @@ -1,20 +1,21 @@ #include "fx.h" -#include "global.h" +#include "nitro/types.h" #include "registers.h" +#include "code32.h" -ARM_FUNC fx32 FX_Div(fx32 numerator, fx32 denominator){ +fx32 FX_Div(fx32 numerator, fx32 denominator){ FX_DivAsync(numerator, denominator); return FX_GetDivResult(); } -ARM_FUNC fx32 FX_Inv(fx32 x){ +fx32 FX_Inv(fx32 x){ FX_InvAsync(x); return FX_GetDivResult(); } -ARM_FUNC fx32 FX_Sqrt(fx32 x){ +fx32 FX_Sqrt(fx32 x){ if (x > 0) { reg_CP_SQRTCNT = 0x1; @@ -27,34 +28,34 @@ ARM_FUNC fx32 FX_Sqrt(fx32 x){ } } -ARM_FUNC fx64c FX_GetDivResultFx64c(){ +fx64c FX_GetDivResultFx64c(){ while (reg_CP_DIVCNT & 0x8000) {} return (fx64c)reg_CP_DIV_RESULT; } -ARM_FUNC fx32 FX_GetDivResult(){ +fx32 FX_GetDivResult(){ while (reg_CP_DIVCNT & 0x8000) {} return (fx32)((reg_CP_DIV_RESULT + (1 << (0x14 - 1))) >> 0x14); } -ARM_FUNC void FX_InvAsync(fx32 x){ +void FX_InvAsync(fx32 x){ reg_CP_DIVCNT = 0x1; reg_CP_DIV_NUMER = (fx64)0x00001000 << 32; reg_CP_DIV_DENOM = (u32)x; } -ARM_FUNC fx32 FX_GetSqrtResult(){ +fx32 FX_GetSqrtResult(){ while (reg_CP_SQRTCNT & 0x8000) {} return (fx32)((reg_CP_SQRT_RESULT + (1 << (0xA - 1))) >> 0xA); } -ARM_FUNC void FX_DivAsync(fx32 numerator, fx32 denominator){ +void FX_DivAsync(fx32 numerator, fx32 denominator){ reg_CP_DIVCNT = 0x1; reg_CP_DIV_NUMER = (u64)((fx64)numerator << 32); reg_CP_DIV_DENOM = (u32)denominator; } -ARM_FUNC fx32 FX_DivS32(fx32 numerator, fx32 denominator){ +fx32 FX_DivS32(fx32 numerator, fx32 denominator){ reg_CP_DIVCNT = 0x0; *(REGType32v *)®_CP_DIV_NUMER = (u32)numerator; //32bit write for some reason reg_CP_DIV_DENOM = (u32)denominator; @@ -62,7 +63,7 @@ ARM_FUNC fx32 FX_DivS32(fx32 numerator, fx32 denominator){ return (fx32)(*(REGType32v *)®_CP_DIV_RESULT); } -ARM_FUNC fx32 FX_ModS32(fx32 num, fx32 mod){ +fx32 FX_ModS32(fx32 num, fx32 mod){ reg_CP_DIVCNT = 0x0; *(REGType32v *)®_CP_DIV_NUMER = (u32)num; //32bit write for some reason reg_CP_DIV_DENOM = (u32)mod; diff --git a/arm9/lib/NitroSDK/src/FX_mtx22.c b/arm9/lib/NitroSDK/src/FX_mtx22.c index a74bb25c8..282bbf0e4 100644 --- a/arm9/lib/NitroSDK/src/FX_mtx22.c +++ b/arm9/lib/NitroSDK/src/FX_mtx22.c @@ -1,15 +1,16 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "fx.h" +#include "code32.h" -ARM_FUNC void MTX_ScaleApply22(struct Mtx22 *mtx, struct Mtx22 *dst, fx32 x, fx32 y){ +void MTX_ScaleApply22(struct Mtx22 *mtx, struct Mtx22 *dst, fx32 x, fx32 y){ dst->_[0] = (fx32)(((fx64)x * mtx->_[0]) >> FX32_INT_SHIFT); dst->_[1] = (fx32)(((fx64)x * mtx->_[1]) >> FX32_INT_SHIFT); dst->_[2] = (fx32)(((fx64)y * mtx->_[2]) >> FX32_INT_SHIFT); dst->_[3] = (fx32)(((fx64)y * mtx->_[3]) >> FX32_INT_SHIFT); } -ARM_FUNC asm void MTX_Identity22_(struct Mtx22 *mtx){ +asm void MTX_Identity22_(struct Mtx22 *mtx){ mov r1, #0x0 mov r2, #0x1000 mov r3, #0x0 @@ -18,7 +19,9 @@ ARM_FUNC asm void MTX_Identity22_(struct Mtx22 *mtx){ bx lr } -THUMB_FUNC asm void MTX_Rot22_(struct Mtx22 *mtx, fx32 sinphi, fx32 cosphi){ +#include "code16.h" //following func is thumb + +asm void MTX_Rot22_(struct Mtx22 *mtx, fx32 sinphi, fx32 cosphi){ str r2, [r0, #0x0] str r1, [r0, #0x4] neg r1, r1 diff --git a/arm9/lib/NitroSDK/src/FX_mtx33.c b/arm9/lib/NitroSDK/src/FX_mtx33.c index 86169ea06..a01df4978 100644 --- a/arm9/lib/NitroSDK/src/FX_mtx33.c +++ b/arm9/lib/NitroSDK/src/FX_mtx33.c @@ -1,8 +1,9 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "fx.h" +#include "code32.h" -ARM_FUNC void MTX_ScaleApply33(struct Mtx33 *mtx, struct Mtx33 *dst, fx32 x, fx32 y, fx32 z){ +void MTX_ScaleApply33(struct Mtx33 *mtx, struct Mtx33 *dst, fx32 x, fx32 y, fx32 z){ dst->_[0] = (fx32)(((fx64)x * mtx->_[0]) >> FX32_INT_SHIFT); dst->_[1] = (fx32)(((fx64)x * mtx->_[1]) >> FX32_INT_SHIFT); dst->_[2] = (fx32)(((fx64)x * mtx->_[2]) >> FX32_INT_SHIFT); @@ -14,7 +15,7 @@ ARM_FUNC void MTX_ScaleApply33(struct Mtx33 *mtx, struct Mtx33 *dst, fx32 x, fx3 dst->_[8] = (fx32)(((fx64)z * mtx->_[8]) >> FX32_INT_SHIFT); } -ARM_FUNC void MTX_Concat33(struct Mtx33 *a, struct Mtx33 *b, struct Mtx33 *c){ +void MTX_Concat33(struct Mtx33 *a, struct Mtx33 *b, struct Mtx33 *c){ struct Mtx33 temp; struct Mtx33 *dst; fx32 a0, a1, a2; @@ -57,7 +58,7 @@ ARM_FUNC void MTX_Concat33(struct Mtx33 *a, struct Mtx33 *b, struct Mtx33 *c){ *c = temp; } -ARM_FUNC void MTX_MultVec33(struct Vecx32 *vec, struct Mtx33 *mtx, struct Vecx32 *dst){ +void MTX_MultVec33(struct Vecx32 *vec, struct Mtx33 *mtx, struct Vecx32 *dst){ fx32 x, y, z; x = vec->x; y = vec->y; @@ -67,7 +68,7 @@ ARM_FUNC void MTX_MultVec33(struct Vecx32 *vec, struct Mtx33 *mtx, struct Vecx32 dst->z = (fx32)(((fx64)x * mtx->_[2] + (fx64)y * mtx->_[5] + (fx64)z * mtx->_[8]) >> FX32_INT_SHIFT); } -ARM_FUNC asm void MTX_Identity33_(struct Mtx33 *mtx){ +asm void MTX_Identity33_(struct Mtx33 *mtx){ mov r2, #0x1000 str r2, [r0, #0x20] mov r3, #0x0 @@ -79,7 +80,9 @@ ARM_FUNC asm void MTX_Identity33_(struct Mtx33 *mtx){ bx lr } -THUMB_FUNC asm void MTX_RotX33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ +#include "code16.h" //following funcs are thumb + +asm void MTX_RotX33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ mov r3, #0x1 lsl r3, r3, #0xc str r3, [r0, #0x0] @@ -96,7 +99,7 @@ THUMB_FUNC asm void MTX_RotX33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ bx lr } -THUMB_FUNC asm void MTX_RotY33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotY33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ str r2, [r0, #0x0] str r2, [r0, #0x20] mov r3, #0x0 @@ -113,7 +116,7 @@ THUMB_FUNC asm void MTX_RotY33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ bx lr } -THUMB_FUNC asm void MTX_RotZ33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotZ33_(struct Mtx33 *mtx, fx32 sinphi, fx32 cosphi){ stmia r0!, {r2} mov r3, #0x0 stmia r0!, {r1,r3} diff --git a/arm9/lib/NitroSDK/src/FX_mtx43.c b/arm9/lib/NitroSDK/src/FX_mtx43.c index 693dddfff..29efd85c7 100644 --- a/arm9/lib/NitroSDK/src/FX_mtx43.c +++ b/arm9/lib/NitroSDK/src/FX_mtx43.c @@ -1,11 +1,11 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "fx.h" +#include "code32.h" void MI_Copy48B(void *src, void *dst); - -ARM_FUNC void MTX_ScaleApply43(struct Mtx43 *mtx, struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){ +void MTX_ScaleApply43(struct Mtx43 *mtx, struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){ //this works because matrices are indexed columns first MTX_ScaleApply33((struct Mtx33 *)mtx, (struct Mtx33 *)dst, x, y, z); dst->_[9] = mtx->_[9]; @@ -13,7 +13,7 @@ ARM_FUNC void MTX_ScaleApply43(struct Mtx43 *mtx, struct Mtx43 *dst, fx32 x, fx3 dst->_[11] = mtx->_[11]; } -ARM_FUNC fx32 MTX_Inverse43(struct Mtx43 *mtx, struct Mtx43 *inv){ +fx32 MTX_Inverse43(struct Mtx43 *mtx, struct Mtx43 *inv){ struct Mtx43 tempmat; struct Mtx43 *dst; fx32 det0, det1, det2, det; @@ -61,7 +61,7 @@ ARM_FUNC fx32 MTX_Inverse43(struct Mtx43 *mtx, struct Mtx43 *inv){ return 0; } -ARM_FUNC void MTX_Concat43(struct Mtx43 *a, struct Mtx43 *b, struct Mtx43 *c){ +void MTX_Concat43(struct Mtx43 *a, struct Mtx43 *b, struct Mtx43 *c){ struct Mtx43 temp; struct Mtx43 *dst; fx32 a0, a1, a2; @@ -109,7 +109,7 @@ ARM_FUNC void MTX_Concat43(struct Mtx43 *a, struct Mtx43 *b, struct Mtx43 *c){ *c = temp; } -ARM_FUNC void MTX_MultVec43(struct Vecx32 *vec, struct Mtx43 *mtx, struct Vecx32 *dst){ +void MTX_MultVec43(struct Vecx32 *vec, struct Mtx43 *mtx, struct Vecx32 *dst){ fx32 x, y, z; x = vec->x; y = vec->y; @@ -122,7 +122,7 @@ ARM_FUNC void MTX_MultVec43(struct Vecx32 *vec, struct Mtx43 *mtx, struct Vecx32 dst->z += mtx->_[11]; } -ARM_FUNC asm void MTX_Identity43_(struct Mtx43 *mtx){ +asm void MTX_Identity43_(struct Mtx43 *mtx){ mov r2, #0x1000 mov r3, #0x0 stmia r0!, {r2-r3} @@ -135,7 +135,7 @@ ARM_FUNC asm void MTX_Identity43_(struct Mtx43 *mtx){ bx lr } -ARM_FUNC asm void MTX_Copy43To44_(struct Mtx43 *src, struct Mtx44 *dst){ +asm void MTX_Copy43To44_(struct Mtx43 *src, struct Mtx44 *dst){ stmdb sp!, {r4} mov r12, #0x0 ldmia r0!, {r2-r4} @@ -151,7 +151,9 @@ ARM_FUNC asm void MTX_Copy43To44_(struct Mtx43 *src, struct Mtx44 *dst){ bx lr } -THUMB_FUNC asm void MTX_Scale43_(struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){ +#include "code16.h" //following funcs are thumb + +asm void MTX_Scale43_(struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){ stmia r0!, {r1} mov r1, #0x0 str r3, [r0, #0x1c] @@ -165,7 +167,7 @@ THUMB_FUNC asm void MTX_Scale43_(struct Mtx43 *dst, fx32 x, fx32 y, fx32 z){ bx lr } -THUMB_FUNC asm void MTX_RotX43_(struct Mtx43 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotX43_(struct Mtx43 *mtx, fx32 sinphi, fx32 cosphi){ str r1, [r0, #0x14] neg r1, r1 str r1, [r0, #0x1c] @@ -183,7 +185,7 @@ THUMB_FUNC asm void MTX_RotX43_(struct Mtx43 *mtx, fx32 sinphi, fx32 cosphi){ bx lr } -THUMB_FUNC asm void MTX_RotY43_(struct Mtx43 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotY43_(struct Mtx43 *mtx, fx32 sinphi, fx32 cosphi){ str r1, [r0, #0x18] mov r3, #0x0 stmia r0!, {r2-r3} diff --git a/arm9/lib/NitroSDK/src/FX_mtx44.c b/arm9/lib/NitroSDK/src/FX_mtx44.c index c72f61587..656d5bf62 100644 --- a/arm9/lib/NitroSDK/src/FX_mtx44.c +++ b/arm9/lib/NitroSDK/src/FX_mtx44.c @@ -1,11 +1,11 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "fx.h" +#include "code32.h" void MI_Copy48B(void *src, void *dst); - -ARM_FUNC void MTX_TransApply44(struct Mtx44 *mtx, struct Mtx44 *dst, fx32 x, fx32 y, fx32 z){ +void MTX_TransApply44(struct Mtx44 *mtx, struct Mtx44 *dst, fx32 x, fx32 y, fx32 z){ if(mtx != dst) MI_Copy48B(mtx, dst); dst->_[12] = mtx->_[12] + (fx32)(((fx64)x * mtx->_[0] + (fx64)y * mtx->_[4] + (fx64)z * mtx->_[8] ) >> FX32_INT_SHIFT); @@ -14,7 +14,7 @@ ARM_FUNC void MTX_TransApply44(struct Mtx44 *mtx, struct Mtx44 *dst, fx32 x, fx3 dst->_[15] = mtx->_[15] + (fx32)(((fx64)x * mtx->_[3] + (fx64)y * mtx->_[7] + (fx64)z * mtx->_[11]) >> FX32_INT_SHIFT); } -ARM_FUNC void MTX_Concat44(struct Mtx44 *a, struct Mtx44 *b, struct Mtx44 *c){ +void MTX_Concat44(struct Mtx44 *a, struct Mtx44 *b, struct Mtx44 *c){ struct Mtx44 temp; struct Mtx44 *dst; fx32 a0, a1, a2, a3; @@ -73,7 +73,7 @@ ARM_FUNC void MTX_Concat44(struct Mtx44 *a, struct Mtx44 *b, struct Mtx44 *c){ *c = temp; } -ARM_FUNC asm void MTX_Identity44_(struct Mtx44 *dst){ +asm void MTX_Identity44_(struct Mtx44 *dst){ mov r2, #0x1000 mov r3, #0x0 stmia r0!, {r2-r3} @@ -87,7 +87,7 @@ ARM_FUNC asm void MTX_Identity44_(struct Mtx44 *dst){ bx lr } -ARM_FUNC asm void MTX_Copy44To43_(struct Mtx44 *src, struct Mtx43 *dst){ +asm void MTX_Copy44To43_(struct Mtx44 *src, struct Mtx43 *dst){ ldmia r0!, {r2-r3,r12} add r0, r0, #0x4 stmia r1!, {r2-r3,r12} @@ -103,7 +103,9 @@ ARM_FUNC asm void MTX_Copy44To43_(struct Mtx44 *src, struct Mtx43 *dst){ bx lr } -THUMB_FUNC asm void MTX_RotX44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ +#include "code16.h" //following funcs are thumb + +asm void MTX_RotX44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ str r2, [r0, #0x14] str r2, [r0, #0x28] str r1, [r0, #0x18] @@ -124,7 +126,7 @@ THUMB_FUNC asm void MTX_RotX44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ bx lr } -THUMB_FUNC asm void MTX_RotY44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotY44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ str r2, [r0, #0x0] str r2, [r0, #0x28] str r1, [r0, #0x20] @@ -145,7 +147,7 @@ THUMB_FUNC asm void MTX_RotY44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ bx lr } -THUMB_FUNC asm void MTX_RotZ44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ +asm void MTX_RotZ44_(struct Mtx44 *mtx, fx32 sinphi, fx32 cosphi){ str r2, [r0, #0x0] str r2, [r0, #0x14] str r1, [r0, #0x4] diff --git a/arm9/lib/NitroSDK/src/FX_sincos.c b/arm9/lib/NitroSDK/src/FX_sincos.c index 89c8fc78e..10ed59cdf 100644 --- a/arm9/lib/NitroSDK/src/FX_sincos.c +++ b/arm9/lib/NitroSDK/src/FX_sincos.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "nitro/types.h" #include "fx.h" /* diff --git a/arm9/lib/NitroSDK/src/FX_vec.c b/arm9/lib/NitroSDK/src/FX_vec.c index 18d0939f6..9348c6c0b 100644 --- a/arm9/lib/NitroSDK/src/FX_vec.c +++ b/arm9/lib/NitroSDK/src/FX_vec.c @@ -1,37 +1,37 @@ -#include "function_target.h" #include "registers.h" #include "fx.h" +#include "code32.h" -ARM_FUNC void VEC_Add(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ +void VEC_Add(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ dst->x = a->x + b->x; dst->y = a->y + b->y; dst->z = a->z + b->z; } -ARM_FUNC void VEC_Subtract(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ +void VEC_Subtract(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ dst->x = a->x - b->x; dst->y = a->y - b->y; dst->z = a->z - b->z; } -ARM_FUNC void VEC_Fx16Add(struct Vecx16 *a, struct Vecx16 *b, struct Vecx16 *dst){ +void VEC_Fx16Add(struct Vecx16 *a, struct Vecx16 *b, struct Vecx16 *dst){ dst->x = (s16)(a->x + b->x); dst->y = (s16)(a->y + b->y); dst->z = (s16)(a->z + b->z); } -ARM_FUNC fx32 VEC_DotProduct(const struct Vecx32 *a, const struct Vecx32 *b){ +fx32 VEC_DotProduct(const struct Vecx32 *a, const struct Vecx32 *b){ return (fx32)(((fx64)a->x * b->x + (fx64)a->y * b->y + (fx64)a->z * b->z + (1 << (FX64_INT_SHIFT - 1))) >> FX64_INT_SHIFT); } -ARM_FUNC fx32 VEC_Fx16DotProduct(struct Vecx16 *a, struct Vecx16 *b){ +fx32 VEC_Fx16DotProduct(struct Vecx16 *a, struct Vecx16 *b){ fx32 temp1, temp2; temp1 = (a->x * b->x) + (a->y * b->y); temp2 = (a->z * b->z) + (1 << (FX64_INT_SHIFT - 1)); return (fx32)(((fx64)temp1 + temp2) >> FX64_INT_SHIFT); } -ARM_FUNC void VEC_CrossProduct(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ +void VEC_CrossProduct(const struct Vecx32 *a, const struct Vecx32 *b, struct Vecx32 *dst){ fx32 x, y, z; x = (fx32)(((fx64)a->y * b->z - (fx64)a->z * b->y + (1 << (FX64_INT_SHIFT - 1))) >> FX64_INT_SHIFT); y = (fx32)(((fx64)a->z * b->x - (fx64)a->x * b->z + (1 << (FX64_INT_SHIFT - 1))) >> FX64_INT_SHIFT); @@ -41,7 +41,7 @@ ARM_FUNC void VEC_CrossProduct(const struct Vecx32 *a, const struct Vecx32 *b, s dst->z = z; } -ARM_FUNC void VEC_Fx16CrossProduct(struct Vecx16 *a, struct Vecx16 *b, struct Vecx16 *dst){ +void VEC_Fx16CrossProduct(struct Vecx16 *a, struct Vecx16 *b, struct Vecx16 *dst){ fx32 x, y, z; x = ((a->y * b->z - a->z * b->y + (1 << (FX64_INT_SHIFT - 1))) >> FX64_INT_SHIFT); y = ((a->z * b->x - a->x * b->z + (1 << (FX64_INT_SHIFT - 1))) >> FX64_INT_SHIFT); @@ -51,7 +51,7 @@ ARM_FUNC void VEC_Fx16CrossProduct(struct Vecx16 *a, struct Vecx16 *b, struct Ve dst->z = (fx16)z; } -ARM_FUNC fx32 VEC_Mag(struct Vecx32 *a){ +fx32 VEC_Mag(struct Vecx32 *a){ fx64 l2 = (fx64)a->x * a->x; l2 += (fx64)a->y * a->y; l2 += (fx64)a->z * a->z; @@ -61,7 +61,7 @@ ARM_FUNC fx32 VEC_Mag(struct Vecx32 *a){ return ((fx32)reg_CP_SQRT_RESULT + 1) >> 1; } -ARM_FUNC void VEC_Normalize(const struct Vecx32 *a, struct Vecx32 *dst){ +void VEC_Normalize(const struct Vecx32 *a, struct Vecx32 *dst){ fx64 l2 = (fx64)a->x * a->x; l2 += (fx64)a->y * a->y; l2 += (fx64)a->z * a->z; @@ -81,7 +81,7 @@ ARM_FUNC void VEC_Normalize(const struct Vecx32 *a, struct Vecx32 *dst){ dst->z = (fx32)((l2 * a->z + (1LL << (0x2D - 1))) >> 0x2D); } -ARM_FUNC void VEC_Fx16Normalize(struct Vecx16 *a, struct Vecx16 *dst){ +void VEC_Fx16Normalize(struct Vecx16 *a, struct Vecx16 *dst){ fx64 l2 = a->x * a->x; l2 += a->y * a->y; l2 += a->z * a->z; @@ -101,7 +101,7 @@ ARM_FUNC void VEC_Fx16Normalize(struct Vecx16 *a, struct Vecx16 *dst){ dst->z = (fx16)((l2 * a->z + (1LL << (0x2D - 1))) >> 0x2D); } -ARM_FUNC void VEC_MultAdd(fx32 factor, struct Vecx32 *a, struct Vecx32 *b, struct Vecx32 *dst){ +void VEC_MultAdd(fx32 factor, struct Vecx32 *a, struct Vecx32 *b, struct Vecx32 *dst){ dst->x = (fx32)(((fx64)factor * a->x) >> FX32_INT_SHIFT) + b->x; dst->y = (fx32)(((fx64)factor * a->y) >> FX32_INT_SHIFT) + b->y; dst->z = (fx32)(((fx64)factor * a->z) >> FX32_INT_SHIFT) + b->z; diff --git a/arm9/lib/NitroSDK/src/GX.c b/arm9/lib/NitroSDK/src/GX.c index d04af375e..0be5b6655 100644 --- a/arm9/lib/NitroSDK/src/GX.c +++ b/arm9/lib/NitroSDK/src/GX.c @@ -1,8 +1,9 @@ #include "gx.h" -#include "global.h" +#include "nitro/types.h" #include "OS_spinLock.h" #include "OS_terminate_proc.h" +#include "code32.h" u32 GXi_DmaId = 3; vu16 GXi_VRamLockId = 0; @@ -12,7 +13,7 @@ static u16 sIsDispOn = TRUE; #define _powcnt_init_mask (REG_GX_POWCNT_E2DGB_MASK | REG_GX_POWCNT_E2DG_MASK | REG_GX_POWCNT_RE_MASK | REG_GX_POWCNT_GE_MASK) -ARM_FUNC void GX_Init(){ +void GX_Init(){ reg_GX_POWCNT |= REG_GX_POWCNT_DSEL_MASK; reg_GX_POWCNT = (u16)((reg_GX_POWCNT & ~_powcnt_init_mask) | _powcnt_init_mask); reg_GX_POWCNT = (u16)(reg_GX_POWCNT | REG_GX_POWCNT_LCD_MASK); @@ -51,7 +52,7 @@ ARM_FUNC void GX_Init(){ reg_G2S_DB_BG3PD = 0x100; } -ARM_FUNC u32 GX_HBlankIntr(u32 enable){ +u32 GX_HBlankIntr(u32 enable){ u32 temp = (u32)(reg_GX_DISPSTAT & REG_GX_DISPSTAT_HBI_MASK); if (enable) { @@ -64,7 +65,7 @@ ARM_FUNC u32 GX_HBlankIntr(u32 enable){ return temp; } -ARM_FUNC u32 GX_VBlankIntr(u32 enable){ +u32 GX_VBlankIntr(u32 enable){ u32 temp = (u32)(reg_GX_DISPSTAT & REG_GX_DISPSTAT_VBI_MASK); if (enable) { @@ -77,14 +78,14 @@ ARM_FUNC u32 GX_VBlankIntr(u32 enable){ return temp; } -ARM_FUNC void GX_DispOff(){ +void GX_DispOff(){ u32 temp = reg_GX_DISPCNT; sIsDispOn = FALSE; sDispMode = (u16)((temp & REG_GX_DISPCNT_MODE_MASK) >> REG_GX_DISPCNT_MODE_SHIFT); reg_GX_DISPCNT = temp & ~REG_GX_DISPCNT_MODE_MASK; } -ARM_FUNC void GX_DispOn(){ +void GX_DispOn(){ sIsDispOn = TRUE; if (sDispMode) { @@ -96,7 +97,7 @@ ARM_FUNC void GX_DispOn(){ } } -ARM_FUNC void GX_SetGraphicsMode(GXDispMode dispMode, GXBGMode bgMode, GXBG0As bg0_2d3d){ +void GX_SetGraphicsMode(GXDispMode dispMode, GXBGMode bgMode, GXBG0As bg0_2d3d){ u32 temp2 = reg_GX_DISPCNT; sDispMode = (u16)dispMode; if (!sIsDispOn) @@ -106,11 +107,11 @@ ARM_FUNC void GX_SetGraphicsMode(GXDispMode dispMode, GXBGMode bgMode, GXBG0As b sIsDispOn = FALSE; } -ARM_FUNC void GXS_SetGraphicsMode(GXBGMode mode){ +void GXS_SetGraphicsMode(GXBGMode mode){ reg_GXS_DB_DISPCNT = (reg_GXS_DB_DISPCNT & ~REG_GXS_DB_DISPCNT_BGMODE_MASK) | mode; } -ARM_FUNC void GXx_SetMasterBrightness_(vu16 *dst, s32 brightness){ +void GXx_SetMasterBrightness_(vu16 *dst, s32 brightness){ if (!brightness) { *dst = 0x0; diff --git a/arm9/lib/NitroSDK/src/GX_asm.c b/arm9/lib/NitroSDK/src/GX_asm.c index 1eb0a011c..cc05f2bc6 100644 --- a/arm9/lib/NitroSDK/src/GX_asm.c +++ b/arm9/lib/NitroSDK/src/GX_asm.c @@ -1,9 +1,10 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "gx.h" +#include "code32.h" //looks like asm and says asm on the tin... -ARM_FUNC asm void GX_SendFifo48B(void *src, void *dst){ +asm void GX_SendFifo48B(void *src, void *dst) { ldmia r0!, {r2-r3,r12} stmia r1, {r2-r3,r12} ldmia r0!, {r2-r3,r12} diff --git a/arm9/lib/NitroSDK/src/GX_bgcnt.c b/arm9/lib/NitroSDK/src/GX_bgcnt.c index 91a67655c..2e5965ffe 100644 --- a/arm9/lib/NitroSDK/src/GX_bgcnt.c +++ b/arm9/lib/NitroSDK/src/GX_bgcnt.c @@ -1,25 +1,27 @@ -#include "global.h" +#include "nitro/types.h" +#include "registers.h" #include "gx.h" +#include "code32.h" -ARM_FUNC void *G2_GetBG0ScrPtr(){ +void *G2_GetBG0ScrPtr(){ u32 temp = (u32)(((reg_G2_BG0CNT & 0x1F00) >> 0x8) << 0xB); return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10) + temp); } -ARM_FUNC void *G2S_GetBG0ScrPtr(){ +void *G2S_GetBG0ScrPtr(){ return (void *)(0x6200000 + (((reg_G2S_DB_BG0CNT & 0x1F00) >> 0x8) << 0xB)); } -ARM_FUNC void *G2_GetBG1ScrPtr(){ +void *G2_GetBG1ScrPtr(){ u32 temp = (u32)(((reg_G2_BG1CNT & 0x1F00) >> 0x8) << 0xB); return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10) + temp); } -ARM_FUNC void *G2S_GetBG1ScrPtr(){ +void *G2S_GetBG1ScrPtr(){ return (void *)(0x6200000 + (((reg_G2S_DB_BG1CNT & 0x1F00) >> 0x8) << 0xB)); } -ARM_FUNC void *G2_GetBG2ScrPtr(){ +void *G2_GetBG2ScrPtr(){ u32 temp12 = (reg_GX_DISPCNT & 0x7); u32 temp3 = reg_G2_BG2CNT; u32 temp2 = (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10); @@ -44,7 +46,7 @@ ARM_FUNC void *G2_GetBG2ScrPtr(){ } } -ARM_FUNC void *G2S_GetBG2ScrPtr(){ +void *G2S_GetBG2ScrPtr(){ u32 temp12 = (reg_GXS_DB_DISPCNT & 0x7); u32 temp3 = reg_G2S_DB_BG2CNT; u32 temp1 = ((temp3 & 0x1F00) >> 0x8); @@ -68,7 +70,7 @@ ARM_FUNC void *G2S_GetBG2ScrPtr(){ } } -ARM_FUNC void *G2_GetBG3ScrPtr(){ +void *G2_GetBG3ScrPtr(){ u32 temp12 = (reg_GX_DISPCNT & 0x7); u32 temp3 = reg_G2_BG3CNT; u32 temp2 = (((reg_GX_DISPCNT & 0x38000000) >> 0x1B) << 0x10); @@ -93,7 +95,7 @@ ARM_FUNC void *G2_GetBG3ScrPtr(){ } } -ARM_FUNC void *G2S_GetBG3ScrPtr(){ +void *G2S_GetBG3ScrPtr(){ u32 temp12 = (reg_GXS_DB_DISPCNT & 0x7); u32 temp3 = reg_G2S_DB_BG3CNT; u32 temp1 = ((temp3 & 0x1F00) >> 0x8); @@ -117,25 +119,25 @@ ARM_FUNC void *G2S_GetBG3ScrPtr(){ } } -ARM_FUNC void *G2_GetBG0CharPtr(){ +void *G2_GetBG0CharPtr(){ u32 temp = (u32)(((reg_G2_BG0CNT & 0x3C) >> 0x2) << 0xE); return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x7000000) >> 0x18) << 0x10) + temp); } -ARM_FUNC void *G2S_GetBG0CharPtr(){ +void *G2S_GetBG0CharPtr(){ return (void *)(0x6200000 + (((reg_G2S_DB_BG0CNT & 0x3C) >> 0x2) << 0xE)); } -ARM_FUNC void *G2_GetBG1CharPtr(){ +void *G2_GetBG1CharPtr(){ u32 temp = (u32)(((reg_G2_BG1CNT & 0x3C) >> 0x2) << 0xE); return (void *)(0x6000000 + (((reg_GX_DISPCNT & 0x7000000) >> 0x18) << 0x10) + temp); } -ARM_FUNC void *G2S_GetBG1CharPtr(){ +void *G2S_GetBG1CharPtr(){ return (void *)(0x6200000 + (((reg_G2S_DB_BG1CNT & 0x3C) >> 0x2) << 0xE)); } -ARM_FUNC void *G2_GetBG2CharPtr(){ +void *G2_GetBG2CharPtr(){ s32 temp1 = (s32)(reg_GX_DISPCNT & 0x7); u32 temp = reg_G2_BG2CNT; if (temp1 < 5 || !(temp & 0x80)) @@ -150,7 +152,7 @@ ARM_FUNC void *G2_GetBG2CharPtr(){ } } -ARM_FUNC void *G2S_GetBG2CharPtr(){ +void *G2S_GetBG2CharPtr(){ s32 temp1 = (s32)(reg_GXS_DB_DISPCNT & 0x7); u32 temp = reg_G2S_DB_BG2CNT; if (temp1 < 5 || !(temp & 0x80)) @@ -164,7 +166,7 @@ ARM_FUNC void *G2S_GetBG2CharPtr(){ } } -ARM_FUNC void *G2_GetBG3CharPtr(){ +void *G2_GetBG3CharPtr(){ s32 temp1 = (s32)(reg_GX_DISPCNT & 0x7); u32 temp = reg_G2_BG3CNT; if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80))) @@ -179,7 +181,7 @@ ARM_FUNC void *G2_GetBG3CharPtr(){ } } -ARM_FUNC void *G2S_GetBG3CharPtr(){ +void *G2S_GetBG3CharPtr(){ s32 temp1 = (s32)(reg_GXS_DB_DISPCNT & 0x7); u32 temp = reg_G2S_DB_BG3CNT; if (temp1 < 3 || (temp1 < 6 && !(temp & 0x80))) diff --git a/arm9/lib/NitroSDK/src/GX_g2.c b/arm9/lib/NitroSDK/src/GX_g2.c index 6f220840a..87db830d4 100644 --- a/arm9/lib/NitroSDK/src/GX_g2.c +++ b/arm9/lib/NitroSDK/src/GX_g2.c @@ -1,7 +1,8 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" -ARM_FUNC void G2x_SetBGyAffine_(u32 ptr, const struct Mtx22 *mtx, fx32 a, fx32 b, fx32 c, fx32 d){ +void G2x_SetBGyAffine_(u32 ptr, const struct Mtx22 *mtx, fx32 a, fx32 b, fx32 c, fx32 d){ fx32 temp0, temp1, temp2, temp3; *((vu32 *)ptr + 0) = (u32)((u16)(fx16)(mtx->_[0] >> 4) | (u16)(fx16)(mtx->_[1] >> 4)<< 0x10); *((vu32 *)ptr + 1) = (u32)((u16)(fx16)(mtx->_[2] >> 4) | (u16)(fx16)(mtx->_[3] >> 4)<< 0x10); @@ -13,11 +14,11 @@ ARM_FUNC void G2x_SetBGyAffine_(u32 ptr, const struct Mtx22 *mtx, fx32 a, fx32 b *((vu32 *)ptr + 3) = (u32)(temp3 >> 4); } -ARM_FUNC void G2x_SetBlendAlpha_(u32 *ptr, GXBlendPlaneMask plane1, GXBlendPlaneMask plane2, fx32 c, fx32 d){ +void G2x_SetBlendAlpha_(u32 *ptr, GXBlendPlaneMask plane1, GXBlendPlaneMask plane2, fx32 c, fx32 d){ *ptr = (u32)(((plane1 | 0x40) | (plane2 << 0x8)) | ((c | (d << 0x8)) << 0x10)); } -ARM_FUNC void G2x_SetBlendBrightness_(volatile u16 *ptr, fx32 a, fx32 brightness){ +void G2x_SetBlendBrightness_(volatile u16 *ptr, fx32 a, fx32 brightness){ if (brightness < 0) { ptr[0] = (u16)(a | 0xC0); @@ -30,7 +31,7 @@ ARM_FUNC void G2x_SetBlendBrightness_(volatile u16 *ptr, fx32 a, fx32 brightness } } -ARM_FUNC void G2x_SetBlendBrightnessExt_(u16 *ptr, fx32 a, fx32 b, fx32 c, fx32 d, fx32 brightness){ +void G2x_SetBlendBrightnessExt_(u16 *ptr, fx32 a, fx32 b, fx32 c, fx32 d, fx32 brightness){ ptr[1] = (u16)(c | (d << 0x8)); if (brightness < 0) { @@ -44,7 +45,7 @@ ARM_FUNC void G2x_SetBlendBrightnessExt_(u16 *ptr, fx32 a, fx32 b, fx32 c, fx32 } } -ARM_FUNC void G2x_ChangeBlendBrightness_(u16 *ptr, fx32 brightness){ +void G2x_ChangeBlendBrightness_(u16 *ptr, fx32 brightness){ u32 temp = *ptr; if (brightness < 0) { diff --git a/arm9/lib/NitroSDK/src/GX_g3.c b/arm9/lib/NitroSDK/src/GX_g3.c index 45b6b11ba..b3ecc0d55 100644 --- a/arm9/lib/NitroSDK/src/GX_g3.c +++ b/arm9/lib/NitroSDK/src/GX_g3.c @@ -1,8 +1,8 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" - -ARM_FUNC void G3_BeginMakeDL(struct GXDLInfo *displaylist, void *r1, u32 r2){ +void G3_BeginMakeDL(struct GXDLInfo *displaylist, void *r1, u32 r2){ displaylist->length = r2; displaylist->bottom = r1; displaylist->curr_cmd = r1; @@ -10,7 +10,7 @@ ARM_FUNC void G3_BeginMakeDL(struct GXDLInfo *displaylist, void *r1, u32 r2){ displaylist->param0_cmd_flg = 0x0; } -ARM_FUNC s32 G3_EndMakeDL(struct GXDLInfo *displaylist){ +s32 G3_EndMakeDL(struct GXDLInfo *displaylist){ if (displaylist->bottom == (u32 *)displaylist->curr_cmd) return 0; //pads the buffer with 0 to 4byte alignment if needed diff --git a/arm9/lib/NitroSDK/src/GX_g3_util.c b/arm9/lib/NitroSDK/src/GX_g3_util.c index b4fdd0cce..3705b70d1 100644 --- a/arm9/lib/NitroSDK/src/GX_g3_util.c +++ b/arm9/lib/NitroSDK/src/GX_g3_util.c @@ -1,8 +1,9 @@ -#include "global.h" +#include "nitro/types.h" +#include "registers.h" #include "gx.h" +#include "code32.h" - -ARM_FUNC void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx){ +void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx){ fx32 fovcot, temp1, temp2; fx64c temp0; vu32 *reg_ptr; @@ -74,7 +75,7 @@ ARM_FUNC void G3i_PerspectiveW_(fx32 fovsin, fx32 fovcos, fx32 ratio, fx32 near, } } -ARM_FUNC void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx){ +void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 near, fx32 far, fx32 scale, u32 load, struct Mtx44 *mtx){ fx64c temp1, temp2, temp3; fx32 temp0, temp4, temp5; vu32 *reg_ptr; @@ -165,7 +166,7 @@ ARM_FUNC void G3i_OrthoW_(fx32 top, fx32 bottom, fx32 left, fx32 right, fx32 nea } } -ARM_FUNC void G3i_LookAt_(const struct Vecx32 *a, const struct Vecx32 *b, const struct Vecx32 *c, BOOL load, struct Mtx43 *mtx){ +void G3i_LookAt_(const struct Vecx32 *a, const struct Vecx32 *b, const struct Vecx32 *c, BOOL load, struct Mtx43 *mtx){ struct Vecx32 temp, temp1, temp2; fx32 c1, c2, c3; vu32 *reg_ptr; @@ -216,7 +217,7 @@ ARM_FUNC void G3i_LookAt_(const struct Vecx32 *a, const struct Vecx32 *b, const } } -ARM_FUNC void G3_RotX(fx32 sinphi, fx32 cosphi){ +void G3_RotX(fx32 sinphi, fx32 cosphi){ vu32 *reg_ptr; reg_ptr = (vu32 *)®_G3_MTX_MULT_3x3; *reg_ptr = 0x1000; @@ -230,7 +231,7 @@ ARM_FUNC void G3_RotX(fx32 sinphi, fx32 cosphi){ *reg_ptr = (vu32)cosphi; } -ARM_FUNC void G3_RotY(fx32 sinphi, fx32 cosphi){ +void G3_RotY(fx32 sinphi, fx32 cosphi){ vu32 *reg_ptr; reg_ptr = (vu32 *)®_G3_MTX_MULT_3x3; *reg_ptr = (vu32)cosphi; @@ -244,7 +245,7 @@ ARM_FUNC void G3_RotY(fx32 sinphi, fx32 cosphi){ *reg_ptr = (vu32)cosphi; } -ARM_FUNC void G3_RotZ(fx32 sinphi, fx32 cosphi){ +void G3_RotZ(fx32 sinphi, fx32 cosphi){ vu32 *reg_ptr; reg_ptr = (vu32 *)®_G3_MTX_MULT_3x3; *reg_ptr = (vu32)cosphi; diff --git a/arm9/lib/NitroSDK/src/GX_g3b.c b/arm9/lib/NitroSDK/src/GX_g3b.c index a3b96a0b9..9c0d4e190 100644 --- a/arm9/lib/NitroSDK/src/GX_g3b.c +++ b/arm9/lib/NitroSDK/src/GX_g3b.c @@ -1,33 +1,33 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" - -ARM_FUNC void G3BS_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx){ +void G3BS_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx){ *(u32 *)displaylist->curr_cmd = 0x16; MI_Copy64B(mtx, displaylist->curr_param); } -ARM_FUNC void G3B_PushMtx(struct GXDLInfo *displaylist){ +void G3B_PushMtx(struct GXDLInfo *displaylist){ *(u32 *)displaylist->curr_cmd = 0x11; displaylist->curr_cmd = (u8 *)displaylist->curr_param; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_PopMtx(struct GXDLInfo *displaylist, void *mtx){ +void G3B_PopMtx(struct GXDLInfo *displaylist, void *mtx){ *(u32 *)displaylist->curr_cmd = 0x12; *displaylist->curr_param = (u32)mtx; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx){ +void G3B_LoadMtx44(struct GXDLInfo *displaylist, struct Mtx44 *mtx){ G3BS_LoadMtx44(displaylist, mtx); displaylist->curr_cmd = (u8 *)displaylist->curr_param + sizeof(struct Mtx44); displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } //color format is RGB555, stored in the lower bits -ARM_FUNC void G3B_Color(struct GXDLInfo * displaylist, u32 vtx_col){ +void G3B_Color(struct GXDLInfo * displaylist, u32 vtx_col){ *(u32 *)displaylist->curr_cmd = 0x20; *displaylist->curr_param = vtx_col; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; @@ -39,14 +39,14 @@ Only feed normalized Vectors only the fractional part and the sign, which is in the first nonfraction bit since the vector is assumed to be normalized, are used */ -ARM_FUNC void G3B_Normal(struct GXDLInfo * displaylist, fx16 x, fx16 y, fx16 z){ +void G3B_Normal(struct GXDLInfo * displaylist, fx16 x, fx16 y, fx16 z){ *(u32 *)displaylist->curr_cmd = 0x21; *displaylist->curr_param = (u32)(((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14)); displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_Vtx(struct GXDLInfo * displaylist, fx32 x, fx32 y, fx32 z){ +void G3B_Vtx(struct GXDLInfo * displaylist, fx32 x, fx32 y, fx32 z){ *(u32 *)displaylist->curr_cmd = 0x23; displaylist->curr_param[0] = (u32)(u16)x | (u32)(u16)y << 0x10; displaylist->curr_param[1] = (u32)(u16)z; @@ -55,14 +55,14 @@ ARM_FUNC void G3B_Vtx(struct GXDLInfo * displaylist, fx32 x, fx32 y, fx32 z){ } //TODO: name arguments -ARM_FUNC void G3B_PolygonAttr(struct GXDLInfo *displaylist, u32 r1, u32 r2, u32 r3, u32 r4, u32 r5, u32 r6){ +void G3B_PolygonAttr(struct GXDLInfo *displaylist, u32 r1, u32 r2, u32 r3, u32 r4, u32 r5, u32 r6){ *(u32 *)displaylist->curr_cmd = 0x29; *displaylist->curr_param = r1 | r2 << 0x4 | r3 << 0x6 | r6 | r4 << 0x18 | r5 << 0x10; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_MaterialColorDiffAmb(struct GXDLInfo *displaylist, u32 diffuse_col, u32 ambient_col, u32 replace){ +void G3B_MaterialColorDiffAmb(struct GXDLInfo *displaylist, u32 diffuse_col, u32 ambient_col, u32 replace){ *(u32 *)displaylist->curr_cmd = 0x30; u32 replace_vtx_color_with_diffuse; if (replace) @@ -74,7 +74,7 @@ ARM_FUNC void G3B_MaterialColorDiffAmb(struct GXDLInfo *displaylist, u32 diffuse displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_MaterialColorSpecEmi(struct GXDLInfo *displaylist, u32 specular_col, u32 emission_col, u32 shiny_table){ +void G3B_MaterialColorSpecEmi(struct GXDLInfo *displaylist, u32 specular_col, u32 emission_col, u32 shiny_table){ *(u32 *)displaylist->curr_cmd = 0x31; u32 enable_shininess_table; if (shiny_table) @@ -91,28 +91,28 @@ Only feed normalized Vectors only the fractional part and the sign, which is in the first nonfraction bit since the vector is assumed to be normalized, are used */ -ARM_FUNC void G3B_LightVector(struct GXDLInfo * displaylist, u32 light_num, fx16 x, fx16 y, fx16 z){ +void G3B_LightVector(struct GXDLInfo * displaylist, u32 light_num, fx16 x, fx16 y, fx16 z){ *(u32 *)displaylist->curr_cmd = 0x32; *displaylist->curr_param = ((x >> 3) & 0x3FF) | (((y >> 3) & 0x3FF) << 0xA) | (((z >> 3) & 0x3FF) << 0x14) | light_num << 0x1E; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_LightColor(struct GXDLInfo * displaylist, u32 light_num, u32 col){ +void G3B_LightColor(struct GXDLInfo * displaylist, u32 light_num, u32 col){ *(u32 *)displaylist->curr_cmd = 0x33; *displaylist->curr_param = col | light_num << 0x1E; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_Begin(struct GXDLInfo * displaylist, u32 type){ +void G3B_Begin(struct GXDLInfo * displaylist, u32 type){ *(u32 *)displaylist->curr_cmd = 0x40; *displaylist->curr_param = type; displaylist->curr_cmd = (u8 *)displaylist->curr_param + 0x4; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; } -ARM_FUNC void G3B_End(struct GXDLInfo * displaylist){ +void G3B_End(struct GXDLInfo * displaylist){ *(u32 *)displaylist->curr_cmd = 0x41; displaylist->curr_cmd = (u8 *)displaylist->curr_param; displaylist->curr_param = (u32 *)displaylist->curr_cmd + 1; diff --git a/arm9/lib/NitroSDK/src/GX_g3imm.c b/arm9/lib/NitroSDK/src/GX_g3imm.c index 1798338e6..c4c1db566 100644 --- a/arm9/lib/NitroSDK/src/GX_g3imm.c +++ b/arm9/lib/NitroSDK/src/GX_g3imm.c @@ -1,17 +1,18 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" -ARM_FUNC void G3_LoadMtx43(struct Mtx43 *mtx){ +void G3_LoadMtx43(struct Mtx43 *mtx){ reg_G3X_GXFIFO = 0x17; GX_SendFifo48B(mtx, (void *)®_G3X_GXFIFO); } -ARM_FUNC void G3_MultMtx43(struct Mtx43 *mtx){ +void G3_MultMtx43(struct Mtx43 *mtx){ reg_G3X_GXFIFO = 0x19; GX_SendFifo48B(mtx, (void *)®_G3X_GXFIFO); } -ARM_FUNC void G3_MultMtx33(struct Mtx33 *mtx){ +void G3_MultMtx33(struct Mtx33 *mtx){ reg_G3X_GXFIFO = 0x1A; MI_Copy36B(mtx, (void *)®_G3X_GXFIFO); } diff --git a/arm9/lib/NitroSDK/src/GX_g3x.c b/arm9/lib/NitroSDK/src/GX_g3x.c index 9954c4cba..4d466c624 100644 --- a/arm9/lib/NitroSDK/src/GX_g3x.c +++ b/arm9/lib/NitroSDK/src/GX_g3x.c @@ -1,10 +1,11 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "gx.h" +#include "code32.h" extern u32 GXi_DmaId; -ARM_FUNC asm void GXi_NopClearFifo128_(void *reg){ +asm void GXi_NopClearFifo128_(void *reg){ mov r1, #0x0 mov r2, #0x0 mov r3, #0x0 @@ -44,7 +45,7 @@ ARM_FUNC asm void GXi_NopClearFifo128_(void *reg){ bx lr } -ARM_FUNC void G3X_Init(){ +void G3X_Init(){ G3X_ClearFifo(); reg_G3_END_VTXS = 0x0; while (reg_G3X_GXSTAT & 0x8000000) {} //wait for geometry engine to not be busy @@ -71,7 +72,7 @@ ARM_FUNC void G3X_Init(){ reg_G3_TEXPLTT_BASE = 0x0; } -ARM_FUNC void G3X_ResetMtxStack(){ +void G3X_ResetMtxStack(){ while (reg_G3X_GXSTAT & 0x8000000) {} reg_G3X_GXSTAT |= 0x8000; reg_G3X_DISP3DCNT |= 0x2000; @@ -82,12 +83,12 @@ ARM_FUNC void G3X_ResetMtxStack(){ reg_G3_TEXPLTT_BASE = 0x0; } -ARM_FUNC void G3X_ClearFifo(){ +void G3X_ClearFifo(){ GXi_NopClearFifo128_((void *)®_G3X_GXFIFO); while (reg_G3X_GXSTAT & 0x8000000) {} } -ARM_FUNC void G3X_InitMtxStack(){ +void G3X_InitMtxStack(){ u32 PV_level, PJ_level; reg_G3X_GXSTAT |= 0x8000; while (G3X_GetMtxStackLevelPV(&PV_level)) {} @@ -105,7 +106,7 @@ ARM_FUNC void G3X_InitMtxStack(){ reg_G3_MTX_IDENTITY = 0x0; } -ARM_FUNC void G3X_ResetMtxStack_2(){ +void G3X_ResetMtxStack_2(){ u32 PV_level, PJ_level; reg_G3X_GXSTAT |= 0x8000; while (G3X_GetMtxStackLevelPV(&PV_level)) {} @@ -124,7 +125,7 @@ ARM_FUNC void G3X_ResetMtxStack_2(){ } -ARM_FUNC void G3X_SetFog(u32 enable, u32 alphamode, u32 depth, s32 offset){ +void G3X_SetFog(u32 enable, u32 alphamode, u32 depth, s32 offset){ if (enable) { reg_G3X_FOG_OFFSET = (u16)offset; @@ -137,7 +138,7 @@ ARM_FUNC void G3X_SetFog(u32 enable, u32 alphamode, u32 depth, s32 offset){ } } -ARM_FUNC u32 G3X_GetClipMtx(struct Mtx44 *dst){ +u32 G3X_GetClipMtx(struct Mtx44 *dst){ if (reg_G3X_GXSTAT & 0x8000000) { return (u32)-1; @@ -149,7 +150,7 @@ ARM_FUNC u32 G3X_GetClipMtx(struct Mtx44 *dst){ } } -ARM_FUNC u32 G3X_GetVectorMtx(struct Mtx33 *dst){ +u32 G3X_GetVectorMtx(struct Mtx33 *dst){ if (reg_G3X_GXSTAT & 0x8000000) { return (u32)-1; @@ -161,15 +162,15 @@ ARM_FUNC u32 G3X_GetVectorMtx(struct Mtx33 *dst){ } } -ARM_FUNC void G3X_SetEdgeColorTable(void *tbl_ptr){ +void G3X_SetEdgeColorTable(void *tbl_ptr){ MIi_CpuCopy16(tbl_ptr, (void *)®_G3X_EDGE_COLOR_0, 0x10); } -ARM_FUNC void G3X_SetFogTable(void *tbl_ptr){ +void G3X_SetFogTable(void *tbl_ptr){ MI_Copy32B(tbl_ptr, (void *)®_G3X_FOG_TABLE_0); } -ARM_FUNC void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u32 enable_fog){ +void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u32 enable_fog){ u32 temp = col | (alpha << 0x10) | (polygon_id << 0x18); if (enable_fog) temp |= 0x8000; @@ -177,7 +178,7 @@ ARM_FUNC void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u reg_G3X_CLEAR_DEPTH = (u16)depth; } -ARM_FUNC void G3X_InitTable(){ +void G3X_InitTable(){ if (GXi_DmaId != -1) { MI_DmaFill32Async(GXi_DmaId, (void *)®_G3X_EDGE_COLOR_0, 0x0, 0x10, 0x0, 0x0); @@ -194,7 +195,7 @@ ARM_FUNC void G3X_InitTable(){ } } -ARM_FUNC u32 G3X_GetMtxStackLevelPV(u32 *level){ +u32 G3X_GetMtxStackLevelPV(u32 *level){ if (reg_G3X_GXSTAT & 0x4000) { return (u32)-1; @@ -206,7 +207,7 @@ ARM_FUNC u32 G3X_GetMtxStackLevelPV(u32 *level){ } } -ARM_FUNC u32 G3X_GetMtxStackLevelPJ(u32 *level){ +u32 G3X_GetMtxStackLevelPJ(u32 *level){ if (reg_G3X_GXSTAT & 0x4000) { return (u32)-1; @@ -218,7 +219,7 @@ ARM_FUNC u32 G3X_GetMtxStackLevelPJ(u32 *level){ } } -ARM_FUNC u32 G3X_GetBoxTestResult(u32 *result){ +u32 G3X_GetBoxTestResult(u32 *result){ if (reg_G3X_GXSTAT & 0x1) { return (u32)-1; @@ -230,6 +231,6 @@ ARM_FUNC u32 G3X_GetBoxTestResult(u32 *result){ } } -ARM_FUNC void G3X_SetHOffset(u32 offset){ +void G3X_SetHOffset(u32 offset){ reg_G2_BG0OFS = offset; } diff --git a/arm9/lib/NitroSDK/src/GX_load2d.c b/arm9/lib/NitroSDK/src/GX_load2d.c index 6bff54be9..4c753f1bc 100644 --- a/arm9/lib/NitroSDK/src/GX_load2d.c +++ b/arm9/lib/NitroSDK/src/GX_load2d.c @@ -1,6 +1,7 @@ -#include "global.h" +#include "nitro/types.h" #include "main.h" #include "gx.h" +#include "code32.h" extern u32 GXi_DmaId; @@ -20,121 +21,121 @@ static inline void *_GXS_OBJ_PTR(){ return (void *)0x6600000; } -ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){ +void GX_LoadBGPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000000 + offset), size); } -ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ +void GXS_LoadBGPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000400 + offset), size); } -ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ +void GX_LoadOBJPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000200 + offset), size); } -ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ +void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000600 + offset), size); } -ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){ +void GX_LoadOAM(void *src, u32 offset, u32 size){ GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000000 + offset), size); } -ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){ +void GXS_LoadOAM(void *src, u32 offset, u32 size){ GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000400 + offset), size); } -ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){ +void GX_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GX_OBJ_PTR(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){ +void GXS_LoadOBJ(void *src, u32 offset, u32 size){ u32 base = (u32)_GXS_OBJ_PTR(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ +void GX_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ +void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ +void GX_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ +void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ +void GX_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ +void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ +void GX_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ +void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3ScrPtr(); GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){ +void GX_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG0CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ +void GXS_LoadBG0Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG0CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){ +void GX_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG1CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ +void GXS_LoadBG1Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG1CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){ +void GX_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG2CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ +void GXS_LoadBG2Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG2CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){ +void GX_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2_GetBG3CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ +void GXS_LoadBG3Char(void *src, u32 offset, u32 size){ u32 base = (u32)G2S_GetBG3CharPtr(); GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size); } -ARM_FUNC void GX_BeginLoadBGExtPltt(){ +void GX_BeginLoadBGExtPltt(){ sBGExtPltt = (s32)GX_ResetBankForBGExtPltt(); switch (sBGExtPltt) { @@ -156,11 +157,11 @@ ARM_FUNC void GX_BeginLoadBGExtPltt(){ } } -ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ +void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sBGExtPlttLCDCBlk + offset - sBGExtPlttLCDCOffset), size, NULL, NULL); } -ARM_FUNC void GX_EndLoadBGExtPltt(){ +void GX_EndLoadBGExtPltt(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForBGExtPltt(sBGExtPltt); sBGExtPltt = 0x0; @@ -168,7 +169,7 @@ ARM_FUNC void GX_EndLoadBGExtPltt(){ sBGExtPlttLCDCOffset = 0x0; } -ARM_FUNC void GX_BeginLoadOBJExtPltt(){ +void GX_BeginLoadOBJExtPltt(){ sOBJExtPltt = (s32)GX_ResetBankForOBJExtPltt(); switch (sOBJExtPltt) { @@ -183,40 +184,40 @@ ARM_FUNC void GX_BeginLoadOBJExtPltt(){ } } -ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ +void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sOBJExtPlttLCDCBlk + offset), size, NULL, NULL); } -ARM_FUNC void GX_EndLoadOBJExtPltt(){ +void GX_EndLoadOBJExtPltt(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForOBJExtPltt(sOBJExtPltt); sOBJExtPltt = 0x0; sOBJExtPlttLCDCBlk = 0x0; } -ARM_FUNC void GXS_BeginLoadBGExtPltt(){ +void GXS_BeginLoadBGExtPltt(){ sSubBGExtPltt = (s32)GX_ResetBankForSubBGExtPltt(); } -ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ +void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x06898000 + offset), size, NULL, NULL); } -ARM_FUNC void GXS_EndLoadBGExtPltt(){ +void GXS_EndLoadBGExtPltt(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForSubBGExtPltt(sSubBGExtPltt); sSubBGExtPltt = 0x0; } -ARM_FUNC void GXS_BeginLoadOBJExtPltt(){ +void GXS_BeginLoadOBJExtPltt(){ sSubOBJExtPltt = (s32)GX_ResetBankForSubOBJExtPltt(); } -ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ +void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x068A0000 + offset), size, NULL, NULL); } -ARM_FUNC void GXS_EndLoadOBJExtPltt(){ +void GXS_EndLoadOBJExtPltt(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForSubOBJExtPltt(sSubOBJExtPltt); sSubOBJExtPltt = 0x0; diff --git a/arm9/lib/NitroSDK/src/GX_load3d.c b/arm9/lib/NitroSDK/src/GX_load3d.c index ae15f32e5..0ca6b3087 100644 --- a/arm9/lib/NitroSDK/src/GX_load3d.c +++ b/arm9/lib/NitroSDK/src/GX_load3d.c @@ -1,6 +1,6 @@ -#include "global.h" -#include "main.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" extern u32 GXi_DmaId; @@ -50,7 +50,7 @@ static const u16 sTexPlttStartAddrTable[8] = { static s32 sClrImg = 0; static u32 sClrImgLCDCBlk = 0; -ARM_FUNC void GX_BeginLoadTex(){ +void GX_BeginLoadTex(){ u32 temp = GX_ResetBankForTex(); sTex = (s32)temp; sTexLCDCBlk1 = (u32)(sTexStartAddrTable[temp].blk1 << 0xC); @@ -58,7 +58,7 @@ ARM_FUNC void GX_BeginLoadTex(){ sSzTexBlk1 = (u32)(sTexStartAddrTable[temp].szBlk1 << 0xC); } -ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){ +void GX_LoadTex(void *src, u32 offset, u32 size){ void *temp; if (!sTexLCDCBlk2) { @@ -87,7 +87,7 @@ ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, temp, size, NULL, NULL); } -ARM_FUNC void GX_EndLoadTex(){ +void GX_EndLoadTex(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForTex(sTex); sSzTexBlk1 = 0x0; @@ -96,24 +96,24 @@ ARM_FUNC void GX_EndLoadTex(){ sTex = 0x0; } -ARM_FUNC void GX_BeginLoadTexPltt(){ +void GX_BeginLoadTexPltt(){ s32 temp = (s32)GX_ResetBankForTexPltt(); sTexPltt = temp; sTexPlttLCDCBlk = (u32)(sTexPlttStartAddrTable[temp >> 4] << 0xC); } -ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){ +void GX_LoadTexPltt(void *src, u32 offset, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sTexPlttLCDCBlk + offset), size, NULL, NULL); } -ARM_FUNC void GX_EndLoadTexPltt(){ +void GX_EndLoadTexPltt(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForTexPltt(sTexPltt); sTexPltt = 0x0; sTexPlttLCDCBlk = 0x0; } -ARM_FUNC void GX_BeginLoadClearImage(){ +void GX_BeginLoadClearImage(){ u32 temp = GX_ResetBankForClearImage(); sClrImg = (s32)temp; switch (temp) @@ -134,15 +134,15 @@ ARM_FUNC void GX_BeginLoadClearImage(){ } } -ARM_FUNC void GX_LoadClearImageColor(void *src, u32 size){ +void GX_LoadClearImageColor(void *src, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sClrImgLCDCBlk), size, NULL, NULL); } -ARM_FUNC void GX_LoadClearImageDepth(void *src, u32 size){ +void GX_LoadClearImageDepth(void *src, u32 size){ GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sClrImgLCDCBlk + 0x20000), size, NULL, NULL); } -ARM_FUNC void GX_EndLoadClearImage(){ +void GX_EndLoadClearImage(){ GXi_WaitDma(GXi_DmaId); GX_SetBankForClearImage(sClrImg); sClrImg = 0x0; diff --git a/arm9/lib/NitroSDK/src/GX_state.c b/arm9/lib/NitroSDK/src/GX_state.c index 003e42b51..41e72adb6 100644 --- a/arm9/lib/NitroSDK/src/GX_state.c +++ b/arm9/lib/NitroSDK/src/GX_state.c @@ -1,9 +1,10 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" struct GX_State gGXState; -ARM_FUNC void GX_InitGXState(){ +void GX_InitGXState(){ gGXState.lcdc = 0x0; gGXState.bg = 0x0; gGXState.obj = 0x0; diff --git a/arm9/lib/NitroSDK/src/GX_vramcnt.c b/arm9/lib/NitroSDK/src/GX_vramcnt.c index abfcd77e4..9690a08ba 100644 --- a/arm9/lib/NitroSDK/src/GX_vramcnt.c +++ b/arm9/lib/NitroSDK/src/GX_vramcnt.c @@ -1,10 +1,11 @@ -#include "global.h" +#include "nitro/types.h" #include "gx.h" +#include "code32.h" extern u16 GXi_VRamLockId; extern struct GX_State gGXState; -ARM_FUNC void GX_VRAMCNT_SetLCDC_(u32 mask){ +void GX_VRAMCNT_SetLCDC_(u32 mask) { if (mask & (0x1 << 0)) reg_GX_VRAMCNT_A = 0x80; if (mask & (0x1 << 1)) @@ -25,7 +26,7 @@ ARM_FUNC void GX_VRAMCNT_SetLCDC_(u32 mask){ reg_GX_VRAMCNT_I = 0x80; } -ARM_FUNC void GX_SetBankForBG(s32 bg){ +void GX_SetBankForBG(s32 bg){ gGXState.lcdc = (u16)(~bg & (gGXState.lcdc | gGXState.bg)); gGXState.bg = (u16)bg; switch (bg) @@ -98,7 +99,7 @@ ARM_FUNC void GX_SetBankForBG(s32 bg){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForOBJ(s32 obj){ +void GX_SetBankForOBJ(s32 obj){ gGXState.lcdc = (u16)(~obj & (gGXState.lcdc | gGXState.obj)); gGXState.obj = (u16)obj; switch (obj) @@ -137,7 +138,7 @@ ARM_FUNC void GX_SetBankForOBJ(s32 obj){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForBGExtPltt(s32 bgextpltt){ +void GX_SetBankForBGExtPltt(s32 bgextpltt){ gGXState.lcdc = (u16)(~bgextpltt & (gGXState.lcdc | gGXState.bgExtPltt)); gGXState.bgExtPltt = (u16)bgextpltt; switch (bgextpltt) @@ -163,7 +164,7 @@ ARM_FUNC void GX_SetBankForBGExtPltt(s32 bgextpltt){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForOBJExtPltt(s32 objextpltt){ +void GX_SetBankForOBJExtPltt(s32 objextpltt){ gGXState.lcdc = (u16)(~objextpltt & (gGXState.lcdc | gGXState.objExtPltt)); gGXState.objExtPltt = (u16)objextpltt; switch (objextpltt) @@ -183,7 +184,7 @@ ARM_FUNC void GX_SetBankForOBJExtPltt(s32 objextpltt){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForTex(s32 tex){ +void GX_SetBankForTex(s32 tex){ gGXState.lcdc = (u16)(~tex & (gGXState.lcdc | gGXState.tex)); gGXState.tex = (u16)tex; if (tex == 0) @@ -246,7 +247,7 @@ ARM_FUNC void GX_SetBankForTex(s32 tex){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForTexPltt(s32 texpltt){ +void GX_SetBankForTexPltt(s32 texpltt){ gGXState.lcdc = (u16)(~texpltt & (gGXState.lcdc | gGXState.texPltt)); gGXState.texPltt = (u16)texpltt; switch (texpltt) @@ -272,7 +273,7 @@ ARM_FUNC void GX_SetBankForTexPltt(s32 texpltt){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForClearImage(s32 clearimage){ +void GX_SetBankForClearImage(s32 clearimage){ gGXState.lcdc = (u16)(~clearimage & (gGXState.lcdc | gGXState.clrImg)); gGXState.clrImg = (u16)clearimage; switch (clearimage) @@ -303,7 +304,7 @@ ARM_FUNC void GX_SetBankForClearImage(s32 clearimage){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForARM7(s32 arm7){ +void GX_SetBankForARM7(s32 arm7){ gGXState.lcdc = (u16)(~arm7 & (gGXState.lcdc | gGXState.arm7)); gGXState.arm7 = (u16)arm7; switch (arm7) @@ -323,12 +324,12 @@ ARM_FUNC void GX_SetBankForARM7(s32 arm7){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForLCDC(s32 lcdc){ +void GX_SetBankForLCDC(s32 lcdc){ gGXState.lcdc |= lcdc; GX_VRAMCNT_SetLCDC_((u32)lcdc); } -ARM_FUNC void GX_SetBankForSubBG(s32 subbg){ +void GX_SetBankForSubBG(s32 subbg){ gGXState.lcdc = (u16)(~subbg & (gGXState.lcdc | gGXState.sub_bg)); gGXState.sub_bg = (u16)subbg; switch (subbg) @@ -347,7 +348,7 @@ ARM_FUNC void GX_SetBankForSubBG(s32 subbg){ } -ARM_FUNC void GX_SetBankForSubOBJ(s32 subobj){ +void GX_SetBankForSubOBJ(s32 subobj){ gGXState.lcdc = (u16)(~subobj & (gGXState.lcdc | gGXState.sub_obj)); gGXState.sub_obj = (u16)subobj; switch (subobj) @@ -364,7 +365,7 @@ ARM_FUNC void GX_SetBankForSubOBJ(s32 subobj){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForSubBGExtPltt(s32 subbgextpltt){ +void GX_SetBankForSubBGExtPltt(s32 subbgextpltt){ gGXState.lcdc = (u16)(~subbgextpltt & (gGXState.lcdc | gGXState.sub_bgExtPltt)); gGXState.sub_bgExtPltt = (u16)subbgextpltt; switch (subbgextpltt) @@ -380,7 +381,7 @@ ARM_FUNC void GX_SetBankForSubBGExtPltt(s32 subbgextpltt){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt){ +void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt){ gGXState.lcdc = (u16)(~subobjextpltt & (gGXState.lcdc | gGXState.sub_objExtPltt)); gGXState.sub_objExtPltt = (u16)subobjextpltt; switch (subobjextpltt) @@ -396,7 +397,7 @@ ARM_FUNC void GX_SetBankForSubOBJExtPltt(s32 subobjextpltt){ GX_VRAMCNT_SetLCDC_(gGXState.lcdc); } -ARM_FUNC u32 resetBankForX_(u16 *ptr){ +u32 resetBankForX_(u16 *ptr){ u16 temp = *ptr; *ptr = 0; gGXState.lcdc |= temp; @@ -404,55 +405,55 @@ ARM_FUNC u32 resetBankForX_(u16 *ptr){ return temp; } -ARM_FUNC u32 GX_ResetBankForBG(){ +u32 GX_ResetBankForBG(){ return resetBankForX_(&gGXState.bg); } -ARM_FUNC u32 GX_ResetBankForOBJ(){ +u32 GX_ResetBankForOBJ(){ return resetBankForX_(&gGXState.obj); } -ARM_FUNC u32 GX_ResetBankForBGExtPltt(){ +u32 GX_ResetBankForBGExtPltt(){ reg_GX_DISPCNT &= ~0x40000000; return resetBankForX_(&gGXState.bgExtPltt); } -ARM_FUNC u32 GX_ResetBankForOBJExtPltt(){ +u32 GX_ResetBankForOBJExtPltt(){ reg_GX_DISPCNT &= ~0x80000000; return resetBankForX_(&gGXState.objExtPltt); } -ARM_FUNC u32 GX_ResetBankForTex(){ +u32 GX_ResetBankForTex(){ return resetBankForX_(&gGXState.tex); } -ARM_FUNC u32 GX_ResetBankForTexPltt(){ +u32 GX_ResetBankForTexPltt(){ return resetBankForX_(&gGXState.texPltt); } -ARM_FUNC u32 GX_ResetBankForClearImage(){ +u32 GX_ResetBankForClearImage(){ return resetBankForX_(&gGXState.clrImg); } -ARM_FUNC u32 GX_ResetBankForSubBG(){ +u32 GX_ResetBankForSubBG(){ return resetBankForX_(&gGXState.sub_bg); } -ARM_FUNC u32 GX_ResetBankForSubOBJ(){ +u32 GX_ResetBankForSubOBJ(){ return resetBankForX_(&gGXState.sub_obj); } -ARM_FUNC u32 GX_ResetBankForSubBGExtPltt(){ +u32 GX_ResetBankForSubBGExtPltt(){ reg_GXS_DB_DISPCNT &= ~REG_GXS_DB_DISPCNT_BG_MASK; return resetBankForX_(&gGXState.sub_bgExtPltt); } -ARM_FUNC u32 GX_ResetBankForSubOBJExtPltt(){ +u32 GX_ResetBankForSubOBJExtPltt(){ reg_GXS_DB_DISPCNT &= ~REG_GXS_DB_DISPCNT_O_MASK; return resetBankForX_(&gGXState.sub_objExtPltt); } -ARM_FUNC u32 disableBankForX_(u16 *ptr){ +u32 disableBankForX_(u16 *ptr){ u32 temp = *ptr; *ptr = 0; if (temp & (0x1 << 0)) @@ -477,102 +478,102 @@ ARM_FUNC u32 disableBankForX_(u16 *ptr){ return temp; } -ARM_FUNC u32 GX_DisableBankForBG(){ +u32 GX_DisableBankForBG(){ return disableBankForX_(&gGXState.bg); } -ARM_FUNC u32 GX_DisableBankForOBJ(){ +u32 GX_DisableBankForOBJ(){ return disableBankForX_(&gGXState.obj); } -ARM_FUNC u32 GX_DisableBankForBGExtPltt(){ +u32 GX_DisableBankForBGExtPltt(){ reg_GX_DISPCNT &= ~REG_GX_DISPCNT_BG_MASK; return disableBankForX_(&gGXState.bgExtPltt); } -ARM_FUNC u32 GX_DisableBankForOBJExtPltt(){ +u32 GX_DisableBankForOBJExtPltt(){ reg_GX_DISPCNT &= ~REG_GX_DISPCNT_O_MASK; return disableBankForX_(&gGXState.objExtPltt); } -ARM_FUNC u32 GX_DisableBankForTex(){ +u32 GX_DisableBankForTex(){ return disableBankForX_(&gGXState.tex); } -ARM_FUNC u32 GX_DisableBankForTexPltt(){ +u32 GX_DisableBankForTexPltt(){ return disableBankForX_(&gGXState.texPltt); } -ARM_FUNC u32 GX_DisableBankForClearImage(){ +u32 GX_DisableBankForClearImage(){ return disableBankForX_(&gGXState.clrImg); } -ARM_FUNC u32 GX_DisableBankForARM7(){ +u32 GX_DisableBankForARM7(){ return disableBankForX_(&gGXState.arm7); } -ARM_FUNC u32 GX_DisableBankForLCDC(){ +u32 GX_DisableBankForLCDC(){ return disableBankForX_(&gGXState.lcdc); } -ARM_FUNC u32 GX_DisableBankForSubBG(){ +u32 GX_DisableBankForSubBG(){ return disableBankForX_(&gGXState.sub_bg); } -ARM_FUNC u32 GX_DisableBankForSubOBJ(){ +u32 GX_DisableBankForSubOBJ(){ return disableBankForX_(&gGXState.sub_obj); } -ARM_FUNC u32 GX_DisableBankForSubBGExtPltt(){ +u32 GX_DisableBankForSubBGExtPltt(){ reg_GXS_DB_DISPCNT &= ~REG_GX_DISPCNT_BG_MASK; return disableBankForX_(&gGXState.sub_bgExtPltt); } -ARM_FUNC u32 GX_DisableBankForSubOBJExtPltt(){ +u32 GX_DisableBankForSubOBJExtPltt(){ reg_GXS_DB_DISPCNT &= ~REG_GX_DISPCNT_O_MASK; return disableBankForX_(&gGXState.sub_objExtPltt); } -ARM_FUNC u32 GX_GetBankForBG(){ +u32 GX_GetBankForBG(){ return gGXState.bg; } -ARM_FUNC u32 GX_GetBankForOBJ(){ +u32 GX_GetBankForOBJ(){ return gGXState.obj; } -ARM_FUNC u32 GX_GetBankForBGExtPltt(){ +u32 GX_GetBankForBGExtPltt(){ return gGXState.bgExtPltt; } -ARM_FUNC u32 GX_GetBankForOBJExtPltt(){ +u32 GX_GetBankForOBJExtPltt(){ return gGXState.objExtPltt; } -ARM_FUNC u32 GX_GetBankForTex(){ +u32 GX_GetBankForTex(){ return gGXState.tex; } -ARM_FUNC u32 GX_GetBankForTexPltt(){ +u32 GX_GetBankForTexPltt(){ return gGXState.texPltt; } -ARM_FUNC u32 GX_GetBankForLCDC(){ +u32 GX_GetBankForLCDC(){ return gGXState.lcdc; } -ARM_FUNC u32 GX_GetBankForSubBG(){ +u32 GX_GetBankForSubBG(){ return gGXState.sub_bg; } -ARM_FUNC u32 GX_GetBankForSubOBJ(){ +u32 GX_GetBankForSubOBJ(){ return gGXState.sub_obj; } -ARM_FUNC u32 GX_GetBankForSubBGExtPltt(){ +u32 GX_GetBankForSubBGExtPltt(){ return gGXState.sub_bgExtPltt; } -ARM_FUNC u32 GX_GetBankForSubOBJExtPltt(){ +u32 GX_GetBankForSubOBJExtPltt(){ return gGXState.sub_objExtPltt; } diff --git a/arm9/lib/NitroSDK/src/MATH_crc.c b/arm9/lib/NitroSDK/src/MATH_crc.c index cf8cc64ca..442bdd038 100644 --- a/arm9/lib/NitroSDK/src/MATH_crc.c +++ b/arm9/lib/NitroSDK/src/MATH_crc.c @@ -1,7 +1,8 @@ -#include "global.h" +#include "nitro/types.h" #include "MATH_crc.h" +#include "code32.h" -ARM_FUNC void MATHi_CRC8InitTable(struct MATHCRC8Table *table, u8 poly) { +void MATHi_CRC8InitTable(struct MATHCRC8Table *table, u8 poly) { u32 r, i, j; u8 *t = table->table; @@ -19,7 +20,7 @@ ARM_FUNC void MATHi_CRC8InitTable(struct MATHCRC8Table *table, u8 poly) { } } -ARM_FUNC void MATHi_CRC8Update(const struct MATHCRC8Table *table, MATHCRC8Context *context, const void *input, u32 length) { +void MATHi_CRC8Update(const struct MATHCRC8Table *table, MATHCRC8Context *context, const void *input, u32 length) { u32 r, i; const u8* t = table->table; u8* data = (u8*)input; @@ -32,7 +33,7 @@ ARM_FUNC void MATHi_CRC8Update(const struct MATHCRC8Table *table, MATHCRC8Contex *context = (MATHCRC8Context)r; } -ARM_FUNC void MATHi_CRC16InitTable(struct MATHCRC16Table *table, u16 poly) { +void MATHi_CRC16InitTable(struct MATHCRC16Table *table, u16 poly) { u32 r, i, j; u16 *t = table->table; @@ -50,7 +51,7 @@ ARM_FUNC void MATHi_CRC16InitTable(struct MATHCRC16Table *table, u16 poly) { } } -ARM_FUNC void MATHi_CRC16InitTableRev(struct MATHCRC16Table *table, u16 poly) { +void MATHi_CRC16InitTableRev(struct MATHCRC16Table *table, u16 poly) { u32 r, i, j; u16 *t = table->table; @@ -68,7 +69,7 @@ ARM_FUNC void MATHi_CRC16InitTableRev(struct MATHCRC16Table *table, u16 poly) { } } -ARM_FUNC void MATHi_CRC16Update(const struct MATHCRC16Table *table, MATHCRC16Context *context, const void *input, u32 length) { +void MATHi_CRC16Update(const struct MATHCRC16Table *table, MATHCRC16Context *context, const void *input, u32 length) { u32 r, i; const u16* t = table->table; u8* data = (u8*)input; @@ -81,7 +82,7 @@ ARM_FUNC void MATHi_CRC16Update(const struct MATHCRC16Table *table, MATHCRC16Con *context = (MATHCRC16Context)r; } -ARM_FUNC void MATHi_CRC16UpdateRev(const struct MATHCRC16Table *table, MATHCRC16Context *context, const void *input, u32 length) { +void MATHi_CRC16UpdateRev(const struct MATHCRC16Table *table, MATHCRC16Context *context, const void *input, u32 length) { u32 r, i; const u16* t = table->table; u8* data = (u8*)input; @@ -94,7 +95,7 @@ ARM_FUNC void MATHi_CRC16UpdateRev(const struct MATHCRC16Table *table, MATHCRC16 *context = (MATHCRC16Context)r; } -ARM_FUNC void MATHi_CRC32InitTableRev(struct MATHCRC32Table *table, u32 poly) { +void MATHi_CRC32InitTableRev(struct MATHCRC32Table *table, u32 poly) { u32 r, i, j; u32 *t = table->table; @@ -112,7 +113,7 @@ ARM_FUNC void MATHi_CRC32InitTableRev(struct MATHCRC32Table *table, u32 poly) { } } -ARM_FUNC void MATHi_CRC32UpdateRev(const struct MATHCRC32Table *table, MATHCRC32Context *context, const void *input, u32 length) { +void MATHi_CRC32UpdateRev(const struct MATHCRC32Table *table, MATHCRC32Context *context, const void *input, u32 length) { u32 r, i; const u32* t = table->table; u8* data = (u8*)input; @@ -125,25 +126,25 @@ ARM_FUNC void MATHi_CRC32UpdateRev(const struct MATHCRC32Table *table, MATHCRC32 *context = r; } -ARM_FUNC u8 MATH_CalcCRC8(const struct MATHCRC8Table *table, const void *data, u32 dataLength) { +u8 MATH_CalcCRC8(const struct MATHCRC8Table *table, const void *data, u32 dataLength) { MATHCRC8Context ctx = 0; MATHi_CRC8Update(table, &ctx, data, dataLength); return ctx; } -ARM_FUNC u16 MATH_CalcCRC16(const struct MATHCRC16Table *table, const void *data, u32 dataLength) { +u16 MATH_CalcCRC16(const struct MATHCRC16Table *table, const void *data, u32 dataLength) { MATHCRC16Context ctx = 0; MATHi_CRC16UpdateRev(table, &ctx, data, dataLength); return ctx; } -ARM_FUNC u16 MATH_CalcCRC16CCITT(const struct MATHCRC16Table *table, const void *data, u32 dataLength) { +u16 MATH_CalcCRC16CCITT(const struct MATHCRC16Table *table, const void *data, u32 dataLength) { MATHCRC16Context ctx = 0xffff; MATHi_CRC16Update(table, &ctx, data, dataLength); return ctx; } -ARM_FUNC u32 MATH_CalcCRC32(const struct MATHCRC32Table *table, const void *data, u32 dataLength) { +u32 MATH_CalcCRC32(const struct MATHCRC32Table *table, const void *data, u32 dataLength) { MATHCRC32Context ctx = (MATHCRC32Context)(~0); MATHi_CRC32UpdateRev(table, &ctx, data, dataLength); return ~ctx; diff --git a/arm9/lib/NitroSDK/src/MATH_dgt.c b/arm9/lib/NitroSDK/src/MATH_dgt.c index 6bb90d990..0ad332853 100644 --- a/arm9/lib/NitroSDK/src/MATH_dgt.c +++ b/arm9/lib/NitroSDK/src/MATH_dgt.c @@ -1,14 +1,15 @@ -#include "global.h" +#include "nitro/types.h" #include "MATH_dgt.h" +#include "code32.h" -ARM_FUNC void MATH_CalcMD5(void *digest, const void *data, u32 dataLength) { +void MATH_CalcMD5(void *digest, const void *data, u32 dataLength) { MATHMD5Context context; MATH_MD5Init(&context); MATH_MD5Update(&context, data, dataLength); MATH_MD5GetHash(&context, digest); } -ARM_FUNC void MATH_CalcSHA1(void *digest, const void *data, u32 dataLength) { +void MATH_CalcSHA1(void *digest, const void *data, u32 dataLength) { MATHSHA1Context context; MATH_SHA1Init(&context); MATH_SHA1Update(&context, data, dataLength); diff --git a/arm9/lib/NitroSDK/src/MATH_pop.c b/arm9/lib/NitroSDK/src/MATH_pop.c index 18582494f..5ad9d2c90 100644 --- a/arm9/lib/NitroSDK/src/MATH_pop.c +++ b/arm9/lib/NitroSDK/src/MATH_pop.c @@ -1,7 +1,8 @@ -#include "global.h" +#include "nitro/types.h" #include "MATH_pop.h" +#include "code32.h" -ARM_FUNC u8 MATH_CountPopulation(u32 x) { +u8 MATH_CountPopulation(u32 x) { x -= (x >> 1) & 0x55555555; x = (x & 0x33333333) + ((x >> 2) & 0x33333333); x += x >> 4; diff --git a/arm9/lib/NitroSDK/src/MI_dma.c b/arm9/lib/NitroSDK/src/MI_dma.c index f322f87fe..672dec310 100644 --- a/arm9/lib/NitroSDK/src/MI_dma.c +++ b/arm9/lib/NitroSDK/src/MI_dma.c @@ -1,11 +1,11 @@ #include "MI_dma.h" -#include "function_target.h" #include "OS_interrupt.h" #include "OS_terminate_proc.h" #include "sections.h" +#include "code32.h" #pragma section ITCM begin -ARM_FUNC void MIi_DmaSetParams(u32 dmaNo, u32 src, u32 dest, u32 ctrl) +void MIi_DmaSetParams(u32 dmaNo, u32 src, u32 dest, u32 ctrl) { OSIntrMode lastIntrMode = OS_DisableInterrupts(); vu32 *p = (vu32 *)((u32)REG_ADDR_DMA0SAD + dmaNo * 12); @@ -15,7 +15,7 @@ ARM_FUNC void MIi_DmaSetParams(u32 dmaNo, u32 src, u32 dest, u32 ctrl) (void)OS_RestoreInterrupts(lastIntrMode); } -ARM_FUNC void MIi_DmaSetParams_wait(u32 dmaNo, u32 src, u32 dest, u32 ctrl) +void MIi_DmaSetParams_wait(u32 dmaNo, u32 src, u32 dest, u32 ctrl) { OSIntrMode enabled = OS_DisableInterrupts(); vu32 *p = (vu32 *)((u32)REG_ADDR_DMA0SAD + dmaNo * 12); @@ -41,7 +41,7 @@ ARM_FUNC void MIi_DmaSetParams_wait(u32 dmaNo, u32 src, u32 dest, u32 ctrl) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void MIi_DmaSetParams_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl) +void MIi_DmaSetParams_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl) { vu32 *p = (vu32 *)((u32)REG_ADDR_DMA0SAD + dmaNo * 12); *p = (vu32)src; @@ -49,7 +49,7 @@ ARM_FUNC void MIi_DmaSetParams_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl) *(p + 2) = (vu32)ctrl; } -ARM_FUNC void MIi_DmaSetParams_wait_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl) +void MIi_DmaSetParams_wait_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl) { vu32 *p = (vu32 *)((u32)REG_ADDR_DMA0SAD + dmaNo * 12); *p = (vu32)src; @@ -81,7 +81,7 @@ ARM_FUNC void MIi_DmaSetParams_wait_noInt(u32 dmaNo, u32 src, u32 dest, u32 ctrl } #pragma section ITCM end -ARM_FUNC void MI_DmaFill32(u32 dmaNo, void *dest, u32 data, u32 size) +void MI_DmaFill32(u32 dmaNo, void *dest, u32 data, u32 size) { vu32 *dmaCntp; if (!size) @@ -103,7 +103,7 @@ ARM_FUNC void MI_DmaFill32(u32 dmaNo, void *dest, u32 data, u32 size) } while(0); } -ARM_FUNC void MI_DmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) +void MI_DmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) { vu32 *dmaCntp; MIi_CheckDma0SourceAddress(dmaNo, (u32)src, size, DMA_SRC_INC); @@ -127,7 +127,7 @@ ARM_FUNC void MI_DmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) } while(0); } -ARM_FUNC void MI_DmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size) +void MI_DmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size) { vu32 *dmaCntp; @@ -152,7 +152,7 @@ ARM_FUNC void MI_DmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size) } while(0); } -ARM_FUNC void MI_DmaFill32Async(u32 dmaNo, void *dest, u32 data, u32 size, MIDmaCallback callback, void *arg) +void MI_DmaFill32Async(u32 dmaNo, void *dest, u32 data, u32 size, MIDmaCallback callback, void *arg) { if (!size) { @@ -174,7 +174,7 @@ ARM_FUNC void MI_DmaFill32Async(u32 dmaNo, void *dest, u32 data, u32 size, MIDma } } -ARM_FUNC void MI_DmaCopy32Async(u32 dmaNo, const void *src, void *dest, u32 size, MIDmaCallback callback, void *arg) +void MI_DmaCopy32Async(u32 dmaNo, const void *src, void *dest, u32 size, MIDmaCallback callback, void *arg) { MIi_CheckDma0SourceAddress(dmaNo, (u32)src, size, DMA_SRC_INC); @@ -198,7 +198,7 @@ ARM_FUNC void MI_DmaCopy32Async(u32 dmaNo, const void *src, void *dest, u32 size } } -ARM_FUNC void MI_WaitDma(u32 dmaNo) +void MI_WaitDma(u32 dmaNo) { OSIntrMode lastIntrMode = OS_DisableInterrupts(); vu32 *dmaCntp = &((vu32 *)REG_ADDR_DMA0SAD)[dmaNo * 3 + 2]; @@ -216,7 +216,7 @@ ARM_FUNC void MI_WaitDma(u32 dmaNo) (void)OS_RestoreInterrupts(lastIntrMode); } -ARM_FUNC void MI_StopDma(u32 dmaNo) +void MI_StopDma(u32 dmaNo) { OSIntrMode lastIntrMode = OS_DisableInterrupts(); vu16 *dmaCntp = &((vu16 *)REG_ADDR_DMA0SAD)[dmaNo * 6 + 5]; @@ -243,7 +243,7 @@ ARM_FUNC void MI_StopDma(u32 dmaNo) (void)OS_RestoreInterrupts(lastIntrMode); } -ARM_FUNC void MIi_CheckAnotherAutoDMA(u32 dmaNo, u32 dmaType) +void MIi_CheckAnotherAutoDMA(u32 dmaNo, u32 dmaType) { u32 dmaCnt; u32 timing; @@ -277,7 +277,7 @@ ARM_FUNC void MIi_CheckAnotherAutoDMA(u32 dmaNo, u32 dmaType) } } -ARM_FUNC void MIi_CheckDma0SourceAddress(u32 dmaNo, u32 src, u32 size, u32 dir) +void MIi_CheckDma0SourceAddress(u32 dmaNo, u32 src, u32 size, u32 dir) { if (!dmaNo) { diff --git a/arm9/lib/NitroSDK/src/MI_dma_card.c b/arm9/lib/NitroSDK/src/MI_dma_card.c index c3b8b8970..6a994adc4 100644 --- a/arm9/lib/NitroSDK/src/MI_dma_card.c +++ b/arm9/lib/NitroSDK/src/MI_dma_card.c @@ -1,8 +1,8 @@ #include "MI_dma_card.h" #include "MI_dma.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC void MIi_CardDmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) +void MIi_CardDmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) { MIi_CheckAnotherAutoDMA(dmaNo, MIi_DMA_TIMING_ANY); MIi_CheckDma0SourceAddress(dmaNo, (u32)src, size, MI_DMA_SRC_FIX); diff --git a/arm9/lib/NitroSDK/src/MI_dma_gxcommand.c b/arm9/lib/NitroSDK/src/MI_dma_gxcommand.c index 26231999e..b8d95d282 100644 --- a/arm9/lib/NitroSDK/src/MI_dma_gxcommand.c +++ b/arm9/lib/NitroSDK/src/MI_dma_gxcommand.c @@ -1,8 +1,8 @@ #include "MI_dma_gxcommand.h" -#include "function_target.h" #include "OS_interrupt.h" #include "OS_reset.h" #include "sections.h" +#include "code32.h" static MIiGXDmaParams MIi_GXDmaParams = { FALSE }; @@ -11,7 +11,7 @@ static void MIi_DMACallback(void *arg); static void MIi_DMAFastCallback(void *arg); #pragma section ITCM begin -ARM_FUNC void MI_SendGXCommand(u32 dmaNo, const void *src, u32 commandLength) +void MI_SendGXCommand(u32 dmaNo, const void *src, u32 commandLength) { vu32 *dmaCntp; u32 leftLength = commandLength; @@ -44,7 +44,7 @@ ARM_FUNC void MI_SendGXCommand(u32 dmaNo, const void *src, u32 commandLength) } #pragma section ITCM end -ARM_FUNC void MI_SendGXCommandAsync(u32 dmaNo, const void *src, u32 commandLength, MIDmaCallback callback, void *arg) +void MI_SendGXCommandAsync(u32 dmaNo, const void *src, u32 commandLength, MIDmaCallback callback, void *arg) { if (!commandLength) { @@ -82,7 +82,7 @@ ARM_FUNC void MI_SendGXCommandAsync(u32 dmaNo, const void *src, u32 commandLengt } } -ARM_FUNC static void MIi_FIFOCallback(void) +static void MIi_FIFOCallback(void) { if (!MIi_GXDmaParams.length) { @@ -108,7 +108,7 @@ ARM_FUNC static void MIi_FIFOCallback(void) } } -ARM_FUNC static void MIi_DMACallback(void *arg) +static void MIi_DMACallback(void *arg) { #pragma unused(arg) (void)OS_DisableIrqMask(OS_IE_GXFIFO); @@ -121,7 +121,7 @@ ARM_FUNC static void MIi_DMACallback(void *arg) MIi_CallCallback(MIi_GXDmaParams.callback, MIi_GXDmaParams.arg); } -ARM_FUNC void MI_SendGXCommandAsyncFast(u32 dmaNo, const void *src, u32 commandLength, MIDmaCallback callback, void *arg) +void MI_SendGXCommandAsyncFast(u32 dmaNo, const void *src, u32 commandLength, MIDmaCallback callback, void *arg) { if (!commandLength) { @@ -146,7 +146,7 @@ ARM_FUNC void MI_SendGXCommandAsyncFast(u32 dmaNo, const void *src, u32 commandL MIi_DmaSetParams(dmaNo, (u32)src, (u32)REG_GXFIFO_ADDR, MI_CNT_GXCOPY_IF(commandLength)); } -ARM_FUNC static void MIi_DMAFastCallback(void *arg) +static void MIi_DMAFastCallback(void *arg) { #pragma unused(arg) MIi_GXDmaParams.isBusy = FALSE; diff --git a/arm9/lib/NitroSDK/src/MI_dma_hblank.c b/arm9/lib/NitroSDK/src/MI_dma_hblank.c index 67e579fed..0636c53b2 100644 --- a/arm9/lib/NitroSDK/src/MI_dma_hblank.c +++ b/arm9/lib/NitroSDK/src/MI_dma_hblank.c @@ -1,8 +1,8 @@ #include "MI_dma_hblank.h" #include "MI_dma.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC void MI_HBlankDmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) +void MI_HBlankDmaCopy32(u32 dmaNo, const void *src, void *dest, u32 size) { MIi_CheckAnotherAutoDMA(dmaNo, MI_DMA_TIMING_H_BLANK); MIi_CheckDma0SourceAddress(dmaNo, (u32)src, size, MI_DMA_SRC_INC); @@ -16,7 +16,7 @@ ARM_FUNC void MI_HBlankDmaCopy32(u32 dmaNo, const void *src, void *dest, u32 siz MIi_DmaSetParams(dmaNo, (u32)src, (u32)dest, (u32)(0x96600000 | (size / 4))); } -ARM_FUNC void MI_HBlankDmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size) +void MI_HBlankDmaCopy16(u32 dmaNo, const void *src, void *dest, u32 size) { MIi_CheckAnotherAutoDMA(dmaNo, MI_DMA_TIMING_H_BLANK); MIi_CheckDma0SourceAddress(dmaNo, (u32)src, size, MI_DMA_SRC_INC); diff --git a/arm9/lib/NitroSDK/src/MI_init.c b/arm9/lib/NitroSDK/src/MI_init.c index 4c8612864..501104e18 100644 --- a/arm9/lib/NitroSDK/src/MI_init.c +++ b/arm9/lib/NitroSDK/src/MI_init.c @@ -1,10 +1,10 @@ #include "MI_init.h" #include "nitro/types.h" -#include "function_target.h" #include "MI_dma.h" #include "MI_wram.h" +#include "code32.h" -ARM_FUNC void MI_Init(void) +void MI_Init(void) { MI_SetWramBank(MI_WRAM_ARM7_ALL); MI_StopDma(0); diff --git a/arm9/lib/NitroSDK/src/MI_memory.c b/arm9/lib/NitroSDK/src/MI_memory.c index a97ff1673..47f98d5f4 100644 --- a/arm9/lib/NitroSDK/src/MI_memory.c +++ b/arm9/lib/NitroSDK/src/MI_memory.c @@ -1,7 +1,7 @@ #include "MI_memory.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC asm void MIi_CpuClear16(register u16 data, register void *destp, register u32 size) +asm void MIi_CpuClear16(register u16 data, register void *destp, register u32 size) { mov r3, #0 @@ -14,7 +14,7 @@ _020CE1CC: bx lr } -ARM_FUNC asm void MIi_CpuCopy16(register const void *srcp, register void *destp, register u32 size) +asm void MIi_CpuCopy16(register const void *srcp, register void *destp, register u32 size) { mov r12, #0 @@ -28,7 +28,7 @@ _020CE1CC: bx lr } -ARM_FUNC asm void MIi_CpuClear32(register u32 data, register void *destp, register u32 size) +asm void MIi_CpuClear32(register u32 data, register void *destp, register u32 size) { add r12, r1, r2 @@ -39,7 +39,7 @@ _020CE200: bx lr } -ARM_FUNC asm void MIi_CpuCopy32(register const void *srcp, register void *destp, register u32 size) +asm void MIi_CpuCopy32(register const void *srcp, register void *destp, register u32 size) { add r12, r1, r2 @@ -51,7 +51,7 @@ _020CE214: bx lr } -ARM_FUNC asm void MIi_CpuSend32(register const void *srcp, volatile void *destp, u32 size) +asm void MIi_CpuSend32(register const void *srcp, volatile void *destp, u32 size) { add r12, r0, r2 @@ -64,7 +64,7 @@ _020CE22C: bx lr } -ARM_FUNC asm void MIi_CpuClearFast(register u32 data, register void *destp, register u32 size) +asm void MIi_CpuClearFast(register u32 data, register void *destp, register u32 size) { stmfd sp!, {r4-r9} @@ -93,7 +93,7 @@ _020CE278: bx lr } -ARM_FUNC asm void MIi_CpuCopyFast(register const void *srcp, register void *destp, register u32 size) +asm void MIi_CpuCopyFast(register const void *srcp, register void *destp, register u32 size) { stmfd sp!, {r4-r10} @@ -116,7 +116,7 @@ _020CE2AC: bx lr } -ARM_FUNC asm void MI_Copy32B(register const void *pSrc, register void *pDest) +asm void MI_Copy32B(register const void *pSrc, register void *pDest) { ldmia r0!, {r2, r3, r12} stmia r1!, {r2, r3, r12} @@ -128,7 +128,7 @@ ARM_FUNC asm void MI_Copy32B(register const void *pSrc, register void *pDest) bx lr } -ARM_FUNC asm void MI_Copy36B(register const void *pSrc, register void *pDest) +asm void MI_Copy36B(register const void *pSrc, register void *pDest) { ldmia r0!, {r2, r3, r12} stmia r1!, {r2, r3, r12} @@ -140,7 +140,7 @@ ARM_FUNC asm void MI_Copy36B(register const void *pSrc, register void *pDest) bx lr } -ARM_FUNC asm void MI_Copy48B(register const void *pSrc, register void *pDest) +asm void MI_Copy48B(register const void *pSrc, register void *pDest) { ldmia r0!, {r2, r3, r12} stmia r1!, {r2, r3, r12} @@ -154,7 +154,7 @@ ARM_FUNC asm void MI_Copy48B(register const void *pSrc, register void *pDest) bx lr } -ARM_FUNC asm void MI_Copy64B(register const void *pSrc, register void *pDest) +asm void MI_Copy64B(register const void *pSrc, register void *pDest) { ldmia r0!, {r2, r3, r12} stmia r1!, {r2, r3, r12} @@ -170,7 +170,7 @@ ARM_FUNC asm void MI_Copy64B(register const void *pSrc, register void *pDest) bx lr } -ARM_FUNC asm void MI_CpuFill8(register void *dstp, register u8 data, register u32 size) +asm void MI_CpuFill8(register void *dstp, register u8 data, register u32 size) { cmp r2, #0 bxeq lr @@ -222,7 +222,7 @@ _020CE3C0: bx lr } -ARM_FUNC asm void MI_CpuCopy8(register const void *srcp, register void *dstp, register u32 size) +asm void MI_CpuCopy8(register const void *srcp, register void *dstp, register u32 size) { cmp r2, #0 bxeq lr @@ -326,7 +326,9 @@ _020CE4EC: bx lr } -THUMB_FUNC asm void MI_Zero36B(register void *pDest) +#include "code16.h" //following func is thumb + +asm void MI_Zero36B(register void *pDest) { mov r1, #0 mov r2, #0 diff --git a/arm9/lib/NitroSDK/src/MI_swap.c b/arm9/lib/NitroSDK/src/MI_swap.c index b72e13865..71305a4d0 100644 --- a/arm9/lib/NitroSDK/src/MI_swap.c +++ b/arm9/lib/NitroSDK/src/MI_swap.c @@ -1,6 +1,8 @@ -#include "global.h" +#include "nitro/types.h" #include "MI_swap.h" +#include "code32.h" + /* * Exchange 32 bits of data between register and memory. * @@ -8,8 +10,7 @@ * but it is not linked in pokediamond. */ -asm -u32 MI_SwapWord(register u32 setData, register vu32 * destp) +asm u32 MI_SwapWord(register u32 setData, register vu32 * destp) { swp setData, setData, [destp] bx lr diff --git a/arm9/lib/NitroSDK/src/MI_uncompress.c b/arm9/lib/NitroSDK/src/MI_uncompress.c index c6ad7e4ef..9f45a89f9 100644 --- a/arm9/lib/NitroSDK/src/MI_uncompress.c +++ b/arm9/lib/NitroSDK/src/MI_uncompress.c @@ -1,7 +1,7 @@ -#include "function_target.h" #include "MI_uncompress.h" +#include "code32.h" -ARM_FUNC asm void MI_UncompressLZ8(register const void *srcp, register void *destp) +asm void MI_UncompressLZ8(register const void *srcp, register void *destp) { stmfd sp!, {r4-r6, lr} diff --git a/arm9/lib/NitroSDK/src/MI_wram.c b/arm9/lib/NitroSDK/src/MI_wram.c index c1433f079..f25f52a73 100644 --- a/arm9/lib/NitroSDK/src/MI_wram.c +++ b/arm9/lib/NitroSDK/src/MI_wram.c @@ -1,9 +1,10 @@ #include "MI_wram.h" -#include "global.h" +#include "nitro/types.h" #include "registers.h" +#include "code32.h" -ARM_FUNC void MI_SetWramBank(MIWram cnt) +void MI_SetWramBank(MIWram cnt) { reg_GX_VRAMCNT_WRAM = (u8)cnt; } diff --git a/arm9/lib/NitroSDK/src/OS_alarm.c b/arm9/lib/NitroSDK/src/OS_alarm.c index a8c1fedd7..ffd0fcf92 100644 --- a/arm9/lib/NitroSDK/src/OS_alarm.c +++ b/arm9/lib/NitroSDK/src/OS_alarm.c @@ -1,10 +1,10 @@ -#include "function_target.h" #include "consts.h" #include "OS_alarm.h" #include "OS_interrupt.h" #include "OS_irqTable.h" #include "OS_terminate_proc.h" #include "OS_system.h" +#include "code32.h" static struct OSiAlarmQueue OSi_AlarmQueue; @@ -14,7 +14,7 @@ static void OSi_SetTimer(OSAlarm *alarm); static void OSi_InsertAlarm(OSAlarm *alarm, OSTick fire); static void OSi_ArrangeTimer(void); -ARM_FUNC static void OSi_SetTimer(OSAlarm *alarm) +static void OSi_SetTimer(OSAlarm *alarm) { OSTick tick = OS_GetTick(); @@ -44,7 +44,7 @@ ARM_FUNC static void OSi_SetTimer(OSAlarm *alarm) (void)OS_EnableIrqMask(OS_IE_TIMER1); } -ARM_FUNC void OS_InitAlarm(void) +void OS_InitAlarm(void) { if (!OSi_UseAlarm) { @@ -59,18 +59,18 @@ ARM_FUNC void OS_InitAlarm(void) } } -ARM_FUNC BOOL OS_IsAlarmAvailable(void) +BOOL OS_IsAlarmAvailable(void) { return OSi_UseAlarm; } -ARM_FUNC void OS_CreateAlarm(OSAlarm *alarm) +void OS_CreateAlarm(OSAlarm *alarm) { alarm->handler = 0; alarm->tag = 0; } -ARM_FUNC static void OSi_InsertAlarm(OSAlarm *alarm, OSTick fire) +static void OSi_InsertAlarm(OSAlarm *alarm, OSTick fire) { if (alarm->period > 0) { @@ -127,7 +127,7 @@ ARM_FUNC static void OSi_InsertAlarm(OSAlarm *alarm, OSTick fire) } } -ARM_FUNC void OS_SetAlarm(OSAlarm * alarm, OSTick tick, OSAlarmHandler handler, void *arg) +void OS_SetAlarm(OSAlarm * alarm, OSTick tick, OSAlarmHandler handler, void *arg) { if (!alarm || alarm->handler) { @@ -146,7 +146,7 @@ ARM_FUNC void OS_SetAlarm(OSAlarm * alarm, OSTick tick, OSAlarmHandler handler, (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_CancelAlarm(OSAlarm *alarm) +void OS_CancelAlarm(OSAlarm *alarm) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -186,7 +186,7 @@ ARM_FUNC void OS_CancelAlarm(OSAlarm *alarm) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC asm void OSi_AlarmHandler(void *arg) +asm void OSi_AlarmHandler(void *arg) { stmfd sp!, {r0, lr} bl OSi_ArrangeTimer @@ -194,7 +194,7 @@ ARM_FUNC asm void OSi_AlarmHandler(void *arg) bx lr } -ARM_FUNC static void OSi_ArrangeTimer(void) +static void OSi_ArrangeTimer(void) { OS_SetTimerControl(OS_TIMER_1, 0); diff --git a/arm9/lib/NitroSDK/src/OS_alloc.c b/arm9/lib/NitroSDK/src/OS_alloc.c index dc84151b1..4b6dae7de 100644 --- a/arm9/lib/NitroSDK/src/OS_alloc.c +++ b/arm9/lib/NitroSDK/src/OS_alloc.c @@ -1,14 +1,11 @@ -// -// Created by mart on 4/23/20. -// -#include "function_target.h" #include "OS_alloc.h" #include "consts.h" #include "OS_system.h" +#include "code32.h" void* OSiHeapInfo[OS_ARENA_MAX]; -ARM_FUNC Cell* DLAddFront(Cell* list, Cell* cell) +Cell* DLAddFront(Cell* list, Cell* cell) { cell->next = list; cell->prev = NULL; @@ -18,7 +15,7 @@ ARM_FUNC Cell* DLAddFront(Cell* list, Cell* cell) return cell; } -ARM_FUNC Cell* DLExtract(Cell* list, Cell* cell) +Cell* DLExtract(Cell* list, Cell* cell) { if (cell->next) { cell->next->prev = cell->prev; @@ -31,7 +28,7 @@ ARM_FUNC Cell* DLExtract(Cell* list, Cell* cell) return list; } -ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted) +Cell *DLInsert(Cell *original, Cell *inserted) { Cell *prevCell = NULL; Cell *nextCell = original; @@ -82,7 +79,7 @@ ARM_FUNC Cell *DLInsert(Cell *original, Cell *inserted) #define HEADERSIZE OSi_ROUND(sizeof(Cell), 32) #define MINOBJSIZE (HEADERSIZE+32) -ARM_FUNC void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) { +void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) { OSHeapInfo* heapInfo; HeapDesc* hd; Cell* cell; @@ -145,7 +142,7 @@ ARM_FUNC void* OS_AllocFromHeap(OSArenaId id, OSHeapHandle heap, u32 size) { return (void *)((char *)cell + HEADERSIZE); } -ARM_FUNC void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr) { +void OS_FreeToHeap(OSArenaId id, OSHeapHandle heap, void* ptr) { OSHeapInfo *heapInfo; HeapDesc *hd; Cell *cell; diff --git a/arm9/lib/NitroSDK/src/OS_arena.c b/arm9/lib/NitroSDK/src/OS_arena.c index cc9694c27..5dc420860 100644 --- a/arm9/lib/NitroSDK/src/OS_arena.c +++ b/arm9/lib/NitroSDK/src/OS_arena.c @@ -1,9 +1,10 @@ #include "OS_arena.h" -#include "global.h" +#include "nitro/types.h" #include "OS_protectionRegion.h" #include "OS_emulator.h" #include "mmap.h" +#include "code32.h" static BOOL OSi_Initialized = FALSE; static BOOL OSi_MainExArenaEnabled = FALSE; @@ -15,7 +16,7 @@ extern void SDK_SECTION_ARENA_DTCM_START(); // TODO: technically this should be extern void SDK_IRQ_STACKSIZE(); // TODO: technically this should be defined in the lcf extern void SDK_SYS_STACKSIZE(); // TODO: technically this should be defined in the lcf -ARM_FUNC void OS_InitArena(void) { +void OS_InitArena(void) { if (OSi_Initialized) { return; } @@ -40,7 +41,7 @@ ARM_FUNC void OS_InitArena(void) { OS_SetArenaLo(OS_ARENA_WRAM_MAIN, OS_GetInitArenaLo(OS_ARENA_WRAM_MAIN)); } -ARM_FUNC void OS_InitArenaEx(void) { +void OS_InitArenaEx(void) { OS_SetArenaHi(OS_ARENA_MAINEX, OS_GetInitArenaHi(OS_ARENA_MAINEX)); OS_SetArenaLo(OS_ARENA_MAINEX, OS_GetInitArenaLo(OS_ARENA_MAINEX)); @@ -50,15 +51,15 @@ ARM_FUNC void OS_InitArenaEx(void) { } } -ARM_FUNC void* OS_GetArenaHi(OSArenaId id) { +void* OS_GetArenaHi(OSArenaId id) { return OSi_GetArenaInfo().hi[id]; } -ARM_FUNC void* OS_GetArenaLo(OSArenaId id) { +void* OS_GetArenaLo(OSArenaId id) { return OSi_GetArenaInfo().lo[id]; } -ARM_FUNC void* OS_GetInitArenaHi(OSArenaId id) { +void* OS_GetInitArenaHi(OSArenaId id) { switch (id) { case OS_ARENA_MAIN: return (void *)OSi_MAIN_ARENA_HI_DEFAULT; @@ -96,7 +97,7 @@ ARM_FUNC void* OS_GetInitArenaHi(OSArenaId id) { } } -ARM_FUNC void* OS_GetInitArenaLo(OSArenaId id) { +void* OS_GetInitArenaLo(OSArenaId id) { switch (id) { case OS_ARENA_MAIN: return (void *)SDK_MAIN_ARENA_LO; @@ -119,15 +120,15 @@ ARM_FUNC void* OS_GetInitArenaLo(OSArenaId id) { } } -ARM_FUNC void OS_SetArenaHi(OSArenaId id, void* newHi) { +void OS_SetArenaHi(OSArenaId id, void* newHi) { OSi_GetArenaInfo().hi[id] = newHi; } -ARM_FUNC void OS_SetArenaLo(OSArenaId id, void* newLo) { +void OS_SetArenaLo(OSArenaId id, void* newLo) { OSi_GetArenaInfo().lo[id] = newLo; } -ARM_FUNC void* OS_AllocFromArenaLo(OSArenaId id, u32 size, u32 align) { +void* OS_AllocFromArenaLo(OSArenaId id, u32 size, u32 align) { void* ptr; u8* arenaLo; ptr = OS_GetArenaLo(id); @@ -145,7 +146,7 @@ ARM_FUNC void* OS_AllocFromArenaLo(OSArenaId id, u32 size, u32 align) { return ptr; } -ARM_FUNC void* OS_AllocFromArenaHi(OSArenaId id, u32 size, u32 align) { +void* OS_AllocFromArenaHi(OSArenaId id, u32 size, u32 align) { void* ptr; u8* arenaHi; diff --git a/arm9/lib/NitroSDK/src/OS_cache.c b/arm9/lib/NitroSDK/src/OS_cache.c index 8b202fda8..a52250231 100644 --- a/arm9/lib/NitroSDK/src/OS_cache.c +++ b/arm9/lib/NitroSDK/src/OS_cache.c @@ -1,15 +1,15 @@ #include "OS_cache.h" #include "nitro/types.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC asm void DC_InvalidateAll(void) +asm void DC_InvalidateAll(void) { mov r0, #0 mcr p15, 0, r0, c7, c6, 0 //Invalidate Entire Data Cache bx lr } -ARM_FUNC asm void DC_StoreAll(void) +asm void DC_StoreAll(void) { mov r1, #0 @@ -30,7 +30,7 @@ _020CC0CC: bx lr } -ARM_FUNC asm void DC_FlushAll(void) +asm void DC_FlushAll(void) { mov r12, #0 mov r1, #0 @@ -53,7 +53,7 @@ _020CC0FC: bx lr } -ARM_FUNC asm void DC_InvalidateRange(register void *startAddr, register u32 nBytes) +asm void DC_InvalidateRange(register void *startAddr, register u32 nBytes) { add r1, r1, r0 bic r0, r0, #31 @@ -67,7 +67,7 @@ _020CC12C: bx lr } -ARM_FUNC asm void DC_StoreRange(register void *startAddr, register u32 nBytes) +asm void DC_StoreRange(register void *startAddr, register u32 nBytes) { add r1, r1, r0 bic r0, r0, #31 @@ -81,7 +81,7 @@ _020CC148: bx lr } -ARM_FUNC asm void DC_FlushRange(register const void *startAddr, register u32 nBytes) +asm void DC_FlushRange(register const void *startAddr, register u32 nBytes) { mov r12, #0 add r1, r1, r0 @@ -97,21 +97,21 @@ _020CC168: bx lr } -ARM_FUNC asm void DC_WaitWriteBufferEmpty(void) +asm void DC_WaitWriteBufferEmpty(void) { mov r0, #0 mcr p15, 0, r0, c7, c10, 4 //Drain Write Buffer bx lr } -ARM_FUNC asm void IC_InvalidateAll(void) +asm void IC_InvalidateAll(void) { mov r0, #0 mcr p15, 0, r0, c7, c5, 0 //Invalidate Entire Instruction Cache bx lr } -ARM_FUNC asm void IC_InvalidateRange(register void *startAddr, register u32 nBytes) +asm void IC_InvalidateRange(register void *startAddr, register u32 nBytes) { add r1, r1, r0 bic r0, r0, #31 diff --git a/arm9/lib/NitroSDK/src/OS_context.c b/arm9/lib/NitroSDK/src/OS_context.c index 38b722ba9..7a5bea05c 100644 --- a/arm9/lib/NitroSDK/src/OS_context.c +++ b/arm9/lib/NitroSDK/src/OS_context.c @@ -1,8 +1,8 @@ #include "OS_context.h" #include "consts.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC asm void OS_InitContext(register OSContext *context, register u32 newpc, register u32 newsp) +asm void OS_InitContext(register OSContext *context, register u32 newpc, register u32 newsp) { add newpc, newpc, #4 str newpc, [context, #0x40] @@ -38,7 +38,7 @@ ARM_FUNC asm void OS_InitContext(register OSContext *context, register u32 newpc bx lr } -ARM_FUNC asm BOOL OS_SaveContext(register OSContext* context) +asm BOOL OS_SaveContext(register OSContext* context) { stmfd sp!, {lr, r0} add r0, r0, #0x48 @@ -65,7 +65,7 @@ ARM_FUNC asm BOOL OS_SaveContext(register OSContext* context) bx lr } -ARM_FUNC asm void OS_LoadContext(register OSContext* context) +asm void OS_LoadContext(register OSContext* context) { stmfd sp!, {lr, r0} add r0, r0, #0x48 diff --git a/arm9/lib/NitroSDK/src/OS_emulator.c b/arm9/lib/NitroSDK/src/OS_emulator.c index e92a7d9da..1d0aa2859 100644 --- a/arm9/lib/NitroSDK/src/OS_emulator.c +++ b/arm9/lib/NitroSDK/src/OS_emulator.c @@ -1,17 +1,13 @@ -// -// Created by red031000 on 2020-05-05. -// - #include "OS_emulator.h" -#include "function_target.h" +#include "code32.h" u32 OSi_ConsoleTypeCache = -1u; -ARM_FUNC BOOL OS_IsRunOnEmulator(void) { +BOOL OS_IsRunOnEmulator(void) { return FALSE; } -ARM_FUNC u32 OS_GetConsoleType(void) { +u32 OS_GetConsoleType(void) { OSi_ConsoleTypeCache = OS_CONSOLE_NITRO | OS_CONSOLE_DEV_CARD | OS_CONSOLE_SIZE_4MB; return OSi_ConsoleTypeCache; diff --git a/arm9/lib/NitroSDK/src/OS_entropy.c b/arm9/lib/NitroSDK/src/OS_entropy.c index 5d466f82e..9fd38ddb3 100644 --- a/arm9/lib/NitroSDK/src/OS_entropy.c +++ b/arm9/lib/NitroSDK/src/OS_entropy.c @@ -1,15 +1,13 @@ -// -// Created by red031000 on 2020-05-03. -// - #include "OS_entropy.h" -#include "global.h" +#include "nitro/types.h" #include "registers.h" #include "systemWork.h" #include "userInfo.h" -ARM_FUNC void OS_GetLowEntropyData(u32 * arr) +#include "code32.h" + +void OS_GetLowEntropyData(u32 * arr) { const OSSystemWork* work = OS_GetSystemWork(); const u8 * macAddress = (u8 *)((u32)(work->nvramUserInfo) + ((sizeof(NVRAMConfig) + 3) & ~3)); diff --git a/arm9/lib/NitroSDK/src/OS_exception.c b/arm9/lib/NitroSDK/src/OS_exception.c index 63cd6d588..461957baf 100644 --- a/arm9/lib/NitroSDK/src/OS_exception.c +++ b/arm9/lib/NitroSDK/src/OS_exception.c @@ -1,9 +1,11 @@ #include "OS_exception.h" -#include "global.h" +#include "nitro/types.h" #include "OS_protectionUnit.h" #include "mmap.h" +#include "code32.h" + static OSiExContext OSi_ExContext; static OSExceptionHandler OSi_UserExceptionHandler; @@ -17,7 +19,7 @@ static void OSi_GetAndDisplayContext(void); static void OSi_SetExContext(void); static void OSi_DisplayExContext(void); -ARM_FUNC void OS_InitException(void) +void OS_InitException(void) { if (0x2600000 <= *(u32 *)HW_EXCEP_VECTOR_BUF_FOR_DEBUGGER && *(u32 *)HW_EXCEP_VECTOR_BUF_FOR_DEBUGGER < 0x2800000) @@ -39,7 +41,7 @@ ARM_FUNC void OS_InitException(void) OSi_UserExceptionHandler = NULL; } -ARM_FUNC asm void OSi_ExceptionHandler(void) +asm void OSi_ExceptionHandler(void) { ldr r12, =OSi_DebuggerHandler ldr r12, [r12] @@ -83,7 +85,7 @@ _020CCA54: bx lr } -ARM_FUNC static asm void OSi_GetAndDisplayContext(void) +static asm void OSi_GetAndDisplayContext(void) { stmfd sp!, {r0, lr} @@ -94,7 +96,7 @@ ARM_FUNC static asm void OSi_GetAndDisplayContext(void) bx lr } -ARM_FUNC static asm void OSi_SetExContext(void) +static asm void OSi_SetExContext(void) { ldr r1, =OSi_ExContext; @@ -143,7 +145,7 @@ ARM_FUNC static asm void OSi_SetExContext(void) bx lr } -ARM_FUNC static void OSi_DisplayExContext(void) +static void OSi_DisplayExContext(void) { if (OSi_UserExceptionHandler) { diff --git a/arm9/lib/NitroSDK/src/OS_init.c b/arm9/lib/NitroSDK/src/OS_init.c index d14656254..ca0edd041 100644 --- a/arm9/lib/NitroSDK/src/OS_init.c +++ b/arm9/lib/NitroSDK/src/OS_init.c @@ -1,13 +1,13 @@ -#include "function_target.h" #include "OS_init.h" #include "MI_init.h" #include "PXI_init.h" #include "CARD_rom.h" +#include "code32.h" extern void CTRDG_Init(void); extern void PM_Init(void); -ARM_FUNC void OS_Init(void) { +void OS_Init(void) { OS_InitArena(); PXI_Init(); OS_InitLock(); diff --git a/arm9/lib/NitroSDK/src/OS_interrupt.c b/arm9/lib/NitroSDK/src/OS_interrupt.c index 699c79296..40c34e49b 100644 --- a/arm9/lib/NitroSDK/src/OS_interrupt.c +++ b/arm9/lib/NitroSDK/src/OS_interrupt.c @@ -1,19 +1,20 @@ #include "OS_interrupt.h" -#include "global.h" +#include "nitro/types.h" #include "registers.h" #include "mmap.h" #include "OS_thread.h" +#include "code32.h" #pragma optimize_for_size on extern OSThreadQueue OSi_IrqThreadQueue; -ARM_FUNC void OS_InitIrqTable(void) { +void OS_InitIrqTable(void) { OS_InitThreadQueue(&OSi_IrqThreadQueue); } -ARM_FUNC void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) { +void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) { s32 i; OSIrqCallbackInfo *info; @@ -41,7 +42,7 @@ ARM_FUNC void OS_SetIrqFunction(OSIrqMask intrBit, OSIrqFunction function) { } } -ARM_FUNC OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit) { +OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit) { s32 i = 0; OSIrqFunction *funcPtr = &OS_IRQTable[0]; @@ -66,7 +67,7 @@ ARM_FUNC OSIrqFunction OS_GetIrqFunction(OSIrqMask intrBit) { return 0; } -ARM_FUNC void OSi_EnterDmaCallback(u32 dmaNo, void (*callback) (void *), void *arg) +void OSi_EnterDmaCallback(u32 dmaNo, void (*callback) (void *), void *arg) { OSIrqMask mask = 1UL << (dmaNo + 8); OSi_IrqCallbackInfo[dmaNo].func = callback; @@ -75,7 +76,7 @@ ARM_FUNC void OSi_EnterDmaCallback(u32 dmaNo, void (*callback) (void *), void *a OSi_IrqCallbackInfo[dmaNo].enable = OS_EnableIrqMask(mask) & mask; } -ARM_FUNC void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg) +void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), void *arg) { OSIrqMask mask = 1UL << (timerNo + 3); OSi_IrqCallbackInfo[timerNo + 4].func = callback; @@ -85,7 +86,7 @@ ARM_FUNC void OSi_EnterTimerCallback(u32 timerNo, void (*callback) (void *), voi OSi_IrqCallbackInfo[timerNo + 4].enable = TRUE; } -ARM_FUNC OSIrqMask OS_SetIrqMask(OSIrqMask mask) +OSIrqMask OS_SetIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -96,7 +97,7 @@ ARM_FUNC OSIrqMask OS_SetIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_EnableIrqMask(OSIrqMask mask) +OSIrqMask OS_EnableIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -107,7 +108,7 @@ ARM_FUNC OSIrqMask OS_EnableIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_DisableIrqMask(OSIrqMask mask) +OSIrqMask OS_DisableIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -118,7 +119,7 @@ ARM_FUNC OSIrqMask OS_DisableIrqMask(OSIrqMask mask) return regIe; } -ARM_FUNC OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask) +OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask) { u16 regIme = reg_OS_IME; reg_OS_IME = 0; @@ -134,7 +135,7 @@ extern void SDK_IRQ_STACKSIZE(void); #define OSi_IRQ_STACK_TOP (HW_DTCM_SVC_STACK - ((s32)SDK_IRQ_STACKSIZE)) #define OSi_IRQ_STACK_BOTTOM HW_DTCM_SVC_STACK -ARM_FUNC void OS_SetIrqStackChecker(void) +void OS_SetIrqStackChecker(void) { *(u32 *)(OSi_IRQ_STACK_BOTTOM - sizeof(u32)) = 0xfddb597dUL; *(u32 *)(OSi_IRQ_STACK_TOP) = 0x7bf9dd5bUL; diff --git a/arm9/lib/NitroSDK/src/OS_irqHandler.c b/arm9/lib/NitroSDK/src/OS_irqHandler.c index b4e2d2324..9f621439a 100644 --- a/arm9/lib/NitroSDK/src/OS_irqHandler.c +++ b/arm9/lib/NitroSDK/src/OS_irqHandler.c @@ -1,14 +1,14 @@ -#include "function_target.h" #include "OS_irqHandler.h" #include "OS_system.h" #include "OS_thread.h" #include "sections.h" #include "CP_context.h" +#include "code32.h" OSThreadQueue OSi_IrqThreadQueue = { NULL, NULL }; #pragma section ITCM begin -ARM_FUNC asm void OS_IrqHandler(void) +asm void OS_IrqHandler(void) { stmfd sp!, {lr} mov ip, #0x04000000 @@ -33,7 +33,7 @@ _01FF8028: bx r0 } -ARM_FUNC asm void OS_IrqHandler_ThreadSwitch(void) +asm void OS_IrqHandler_ThreadSwitch(void) { ldr ip, =OSi_IrqThreadQueue mov r3, #0x0 @@ -127,7 +127,7 @@ _01FF8120: } #pragma section ITCM end -ARM_FUNC void OS_WaitIrq(BOOL clear, OSIrqMask irqFlags) +void OS_WaitIrq(BOOL clear, OSIrqMask irqFlags) { OSIntrMode lastIntrMode = OS_DisableInterrupts(); if (clear) diff --git a/arm9/lib/NitroSDK/src/OS_irqTable.c b/arm9/lib/NitroSDK/src/OS_irqTable.c index cc2a3a557..886657912 100644 --- a/arm9/lib/NitroSDK/src/OS_irqTable.c +++ b/arm9/lib/NitroSDK/src/OS_irqTable.c @@ -1,6 +1,6 @@ -#include "function_target.h" #include "sections.h" #include "OS_irqTable.h" +#include "code32.h" #pragma section DTCM begin OSIrqFunction OS_IRQTable[22] = { @@ -44,12 +44,12 @@ static u16 OSi_IrqCallbackInfoIndex[8] = { 8, 9, 10, 11, 3, 4, 5, 6 }; -ARM_FUNC void OS_IrqDummy(void) +void OS_IrqDummy(void) { //noop } -ARM_FUNC void OSi_IrqCallback(s32 index) +void OSi_IrqCallback(s32 index) { OSIrqMask mask = (1UL << OSi_IrqCallbackInfoIndex[index]); void (*callback)(void *) = OSi_IrqCallbackInfo[index].func; @@ -69,42 +69,42 @@ ARM_FUNC void OSi_IrqCallback(s32 index) } } -ARM_FUNC void OSi_IrqDma0(void) +void OSi_IrqDma0(void) { OSi_IrqCallback(0); } -ARM_FUNC void OSi_IrqDma1(void) +void OSi_IrqDma1(void) { OSi_IrqCallback(1); } -ARM_FUNC void OSi_IrqDma2(void) +void OSi_IrqDma2(void) { OSi_IrqCallback(2); } -ARM_FUNC void OSi_IrqDma3(void) +void OSi_IrqDma3(void) { OSi_IrqCallback(3); } -ARM_FUNC void OSi_IrqTimer0(void) +void OSi_IrqTimer0(void) { OSi_IrqCallback(4); } -ARM_FUNC void OSi_IrqTimer1(void) +void OSi_IrqTimer1(void) { OSi_IrqCallback(5); } -ARM_FUNC void OSi_IrqTimer2(void) +void OSi_IrqTimer2(void) { OSi_IrqCallback(6); } -ARM_FUNC void OSi_IrqTimer3(void) +void OSi_IrqTimer3(void) { OSi_IrqCallback(7); } diff --git a/arm9/lib/NitroSDK/src/OS_message.c b/arm9/lib/NitroSDK/src/OS_message.c index 3b5c33b0a..d4ba45a36 100644 --- a/arm9/lib/NitroSDK/src/OS_message.c +++ b/arm9/lib/NitroSDK/src/OS_message.c @@ -1,9 +1,9 @@ #include "OS_message.h" -#include "function_target.h" #include "OS_system.h" #include "OS_thread.h" +#include "code32.h" -ARM_FUNC void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount) +void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount) { OS_InitThreadQueue(&mq->queueSend); OS_InitThreadQueue(&mq->queueReceive); @@ -13,7 +13,7 @@ ARM_FUNC void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 m mq->usedCount = 0; } -ARM_FUNC BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) +BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -40,7 +40,7 @@ ARM_FUNC BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) return TRUE; } -ARM_FUNC BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) +BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -70,7 +70,7 @@ ARM_FUNC BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) return TRUE; } -ARM_FUNC BOOL OS_JamMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) +BOOL OS_JamMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -97,7 +97,7 @@ ARM_FUNC BOOL OS_JamMessage(OSMessageQueue *mq, OSMessage msg, s32 flags) return TRUE; } -ARM_FUNC BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) +BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags) { OSIntrMode enabled = OS_DisableInterrupts(); diff --git a/arm9/lib/NitroSDK/src/OS_mutex.c b/arm9/lib/NitroSDK/src/OS_mutex.c index 5eb999a97..fb0650b0f 100644 --- a/arm9/lib/NitroSDK/src/OS_mutex.c +++ b/arm9/lib/NitroSDK/src/OS_mutex.c @@ -1,16 +1,16 @@ #include "nitro/types.h" -#include "function_target.h" #include "OS_mutex.h" #include "OS_system.h" +#include "code32.h" -ARM_FUNC void OS_InitMutex(OSMutex *mutex) +void OS_InitMutex(OSMutex *mutex) { OS_InitThreadQueue(&mutex->queue); mutex->thread = NULL; mutex->count = 0; } -ARM_FUNC void OS_LockMutex(OSMutex *mutex) +void OS_LockMutex(OSMutex *mutex) { OSIntrMode prevIntrMode = OS_DisableInterrupts(); OSThread *currentThread = OS_GetCurrentThread(); @@ -43,7 +43,7 @@ ARM_FUNC void OS_LockMutex(OSMutex *mutex) (void)OS_RestoreInterrupts(prevIntrMode); } -ARM_FUNC void OS_UnlockMutex(OSMutex *mutex) +void OS_UnlockMutex(OSMutex *mutex) { OSIntrMode prevIntrMode = OS_DisableInterrupts(); OSThread *currentThread = OS_GetCurrentThread(); @@ -59,7 +59,7 @@ ARM_FUNC void OS_UnlockMutex(OSMutex *mutex) (void)OS_RestoreInterrupts(prevIntrMode); } -ARM_FUNC void OSi_UnlockAllMutex(OSThread *thread) +void OSi_UnlockAllMutex(OSThread *thread) { OSMutex *mutex; while (thread->mutexQueue.head) @@ -72,7 +72,7 @@ ARM_FUNC void OSi_UnlockAllMutex(OSThread *thread) } } -ARM_FUNC BOOL OS_TryLockMutex(OSMutex *mutex) +BOOL OS_TryLockMutex(OSMutex *mutex) { OSIntrMode prevIntrMode = OS_DisableInterrupts(); OSThread *currentThread = OS_GetCurrentThread(); @@ -99,7 +99,7 @@ ARM_FUNC BOOL OS_TryLockMutex(OSMutex *mutex) return locked; } -ARM_FUNC void OSi_EnqueueTail(OSThread *thread, OSMutex *mutex) +void OSi_EnqueueTail(OSThread *thread, OSMutex *mutex) { OSMutex *prev = thread->mutexQueue.tail; @@ -117,7 +117,7 @@ ARM_FUNC void OSi_EnqueueTail(OSThread *thread, OSMutex *mutex) thread->mutexQueue.tail = mutex; } -ARM_FUNC void OSi_DequeueItem(OSThread *thread, OSMutex *mutex) +void OSi_DequeueItem(OSThread *thread, OSMutex *mutex) { OSMutex *next = mutex->link.next; OSMutex *prev = mutex->link.prev; diff --git a/arm9/lib/NitroSDK/src/OS_ownerInfo.c b/arm9/lib/NitroSDK/src/OS_ownerInfo.c index 6693f73f6..27b1807d3 100644 --- a/arm9/lib/NitroSDK/src/OS_ownerInfo.c +++ b/arm9/lib/NitroSDK/src/OS_ownerInfo.c @@ -1,15 +1,16 @@ #include "OS_ownerInfo.h" -#include "global.h" +#include "nitro/types.h" #include "systemWork.h" #include "MI_memory.h" +#include "code32.h" -ARM_FUNC void OS_GetMacAddress(u8 *macAddress) +void OS_GetMacAddress(u8 *macAddress) { MI_CpuCopy8((void *)0x027FFCF4, macAddress, 0x6); } -ARM_FUNC void OS_GetOwnerInfo(OSOwnerInfo* info) +void OS_GetOwnerInfo(OSOwnerInfo* info) { NVRAMConfig *src = (NVRAMConfig *)OS_GetSystemWork()->nvramUserInfo; info->language = (u8)src->ncd.option.language; @@ -22,7 +23,7 @@ ARM_FUNC void OS_GetOwnerInfo(OSOwnerInfo* info) MIi_CpuCopy16(src->ncd.owner.comment.str, info->comment, 26 * sizeof(u16)); } -ARM_FUNC s64 OS_GetOwnerRtcOffset(void) +s64 OS_GetOwnerRtcOffset(void) { NVRAMConfig *src = (NVRAMConfig *)OS_GetSystemWork()->nvramUserInfo; return src->ncd.option.rtcOffset; diff --git a/arm9/lib/NitroSDK/src/OS_printf.c b/arm9/lib/NitroSDK/src/OS_printf.c index 414f0db9d..8637d37b6 100644 --- a/arm9/lib/NitroSDK/src/OS_printf.c +++ b/arm9/lib/NitroSDK/src/OS_printf.c @@ -1,5 +1,6 @@ -#include "global.h" +#include "nitro/types.h" #include "OS_printf.h" +#include "code32.h" typedef struct printfStr { @@ -12,7 +13,7 @@ void string_put_char(struct printfStr *dest, s8 value); void string_fill_char(struct printfStr *dest, s8 value, s32 count); void string_put_string(struct printfStr *dest, const s8 *src, s32 count); -ARM_FUNC void string_put_char(struct printfStr *dest, s8 value) +void string_put_char(struct printfStr *dest, s8 value) { if (dest->spaceLeft != 0) { @@ -22,7 +23,7 @@ ARM_FUNC void string_put_char(struct printfStr *dest, s8 value) dest->stringEnd++; } -ARM_FUNC void string_fill_char(struct printfStr *dest, s8 value, s32 count) +void string_fill_char(struct printfStr *dest, s8 value, s32 count) { if (count <= 0) return; @@ -41,7 +42,7 @@ ARM_FUNC void string_fill_char(struct printfStr *dest, s8 value, s32 count) dest->stringEnd += count; // this is wrong but matching... } -ARM_FUNC void string_put_string(struct printfStr *dest, const s8 *src, s32 count) +void string_put_string(struct printfStr *dest, const s8 *src, s32 count) { if (count <= 0) return; @@ -60,18 +61,18 @@ ARM_FUNC void string_put_string(struct printfStr *dest, const s8 *src, s32 count dest->stringEnd += count; // this is wrong but matching... } -ARM_FUNC s32 OS_SPrintf(s8 *buffer, const s8 *format, ...) +s32 OS_SPrintf(s8 *buffer, const s8 *format, ...) { void *args = (void *)((u32 *)((u32)&format & ~0x3) + 1); // hack since mwccarm doesn't have apparently return OS_VSPrintf(buffer, format, args); } -ARM_FUNC s32 OS_VSPrintf(s8 *buffer, const s8 *format, void *args) +s32 OS_VSPrintf(s8 *buffer, const s8 *format, void *args) { return OS_VSNPrintf(buffer, 0x7FFFFFFF, format, args); } -ARM_FUNC s32 OS_SNPrintf(s8 *buffer, s32 bufsz, const s8 *format, ...) +s32 OS_SNPrintf(s8 *buffer, s32 bufsz, const s8 *format, ...) { void *args = (void *)((u32 *)((u32)&format & ~0x3) + 1); // hack since mwccarm doesn't have apparently return OS_VSNPrintf(buffer, bufsz, format, args); @@ -80,7 +81,7 @@ ARM_FUNC s32 OS_SNPrintf(s8 *buffer, s32 bufsz, const s8 *format, ...) #define va_arg(list, ty) *(ty *)((u32 *)(list = (void *)((u32 *)(list) + 1)) - 1) #define va_arg_64(list, sgn) *((sgn##64 *)(list = (void *)((sgn##64 *)(list) + 1)) - 1) -ARM_FUNC s32 OS_VSNPrintf(s8 *buffer, s32 bufsz, const s8 *format, void *args) +s32 OS_VSNPrintf(s8 *buffer, s32 bufsz, const s8 *format, void *args) { s8 buf[24]; s32 n_buf; diff --git a/arm9/lib/NitroSDK/src/OS_protectionRegion.c b/arm9/lib/NitroSDK/src/OS_protectionRegion.c index 4b8d8297a..fd23defec 100644 --- a/arm9/lib/NitroSDK/src/OS_protectionRegion.c +++ b/arm9/lib/NitroSDK/src/OS_protectionRegion.c @@ -1,7 +1,7 @@ -#include "function_target.h" #include "OS_protectionRegion.h" +#include "code32.h" -ARM_FUNC asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags) +asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags) { mrc p15, 0x0, r2, c5, c0, 0x2 //Extended Access Permission Data Protection Region bic r2, r2, r0 @@ -10,13 +10,13 @@ ARM_FUNC asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, re bx lr } -ARM_FUNC asm void OS_SetProtectionRegion1(u32 param) +asm void OS_SetProtectionRegion1(u32 param) { mcr p15, 0x0, r0, c6, c1, 0x0 //Protection Unit Data Region 1 bx lr } -ARM_FUNC asm void OS_SetProtectionRegion2(u32 param) +asm void OS_SetProtectionRegion2(u32 param) { mcr p15, 0x0, r0, c6, c2, 0x0 //Protection Unit Data Region 2 bx lr diff --git a/arm9/lib/NitroSDK/src/OS_protectionUnit.c b/arm9/lib/NitroSDK/src/OS_protectionUnit.c index 66811a1e6..9f198836f 100644 --- a/arm9/lib/NitroSDK/src/OS_protectionUnit.c +++ b/arm9/lib/NitroSDK/src/OS_protectionUnit.c @@ -1,7 +1,7 @@ -#include "function_target.h" #include "OS_protectionUnit.h" +#include "code32.h" -ARM_FUNC asm void OS_EnableProtectionUnit(void) +asm void OS_EnableProtectionUnit(void) { mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register orr r0, r0, #0x1 @@ -9,7 +9,7 @@ ARM_FUNC asm void OS_EnableProtectionUnit(void) bx lr } -ARM_FUNC asm void OS_DisableProtectionUnit(void) +asm void OS_DisableProtectionUnit(void) { mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register bic r0, r0, #0x1 diff --git a/arm9/lib/NitroSDK/src/OS_reset.c b/arm9/lib/NitroSDK/src/OS_reset.c index 083f23216..b9f9a665f 100644 --- a/arm9/lib/NitroSDK/src/OS_reset.c +++ b/arm9/lib/NitroSDK/src/OS_reset.c @@ -1,6 +1,6 @@ #include "OS_reset.h" -#include "global.h" +#include "nitro/types.h" #include "MB_mb.h" #include "OS_terminate_proc.h" #include "OS_interrupt.h" @@ -12,6 +12,7 @@ #include "CARD_common.h" #include "PXI_init.h" #include "PXI_fifo.h" +#include "code32.h" static u16 OSi_IsInitReset = 0; vu16 OSi_IsResetOccurred = 0; @@ -23,7 +24,7 @@ static void OSi_CpuClear32(register u32 data, register void *destp, register u32 static void OSi_ReloadRomData(void); static void OSi_ReadCardRom32(u32 src, void *dst, s32 len); -ARM_FUNC void OS_InitReset(void) { +void OS_InitReset(void) { if (OSi_IsInitReset) { return; } @@ -34,7 +35,7 @@ ARM_FUNC void OS_InitReset(void) { PXI_SetFifoRecvCallback(PXI_FIFO_TAG_OS, OSi_CommonCallback); } -ARM_FUNC static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) { +static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) { #pragma unused(tag, err) //needed because otherwise -W all errors u16 command = (u16)((data & OS_PXI_COMMAND_MASK) >> OS_PXI_COMMAND_SHIFT); if (command == OS_PXI_COMMAND_RESET) @@ -45,11 +46,11 @@ ARM_FUNC static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err) { OS_Terminate(); } -ARM_FUNC static void OSi_SendToPxi(u16 data) { +static void OSi_SendToPxi(u16 data) { while (PXI_SendWordByFifo(PXI_FIFO_TAG_OS, (u32)data << 0x8, FALSE)) {} } -ARM_FUNC void OS_ResetSystem(u32 parameter) { +void OS_ResetSystem(u32 parameter) { if (MB_IsMultiBootChild()) { OS_Terminate(); } @@ -66,7 +67,7 @@ ARM_FUNC void OS_ResetSystem(u32 parameter) { } #pragma section ITCM begin -ARM_FUNC static void OSi_DoResetSystem(void) +static void OSi_DoResetSystem(void) { while (!OSi_IsResetOccurred) { } @@ -75,7 +76,7 @@ ARM_FUNC static void OSi_DoResetSystem(void) OSi_DoBoot(); } -ARM_FUNC asm void OSi_DoBoot(void) +asm void OSi_DoBoot(void) { mov ip, #0x04000000 str ip, [ip, #0x208] @@ -124,7 +125,7 @@ _01FF822C: bx ip } -ARM_FUNC static asm void OSi_CpuClear32(register u32 data, register void *destp, register u32 size) +static asm void OSi_CpuClear32(register u32 data, register void *destp, register u32 size) { add ip, r1, r2 _01FF8284: @@ -134,7 +135,7 @@ _01FF8284: bx lr } -ARM_FUNC static void OSi_ReloadRomData(void) +static void OSi_ReloadRomData(void) { u32 header = (u32)HW_ROM_HEADER_BUF; const u32 rom_base = *(u32 *)HW_ROM_BASE_OFFSET_BUF; @@ -188,7 +189,7 @@ enum CARD_ENUM_END }; -ARM_FUNC static void OSi_ReadCardRom32(u32 src, void *dst, s32 len) +static void OSi_ReadCardRom32(u32 src, void *dst, s32 len) { vu32 *const hdr_GAME_BUF = (vu32 *)(HW_ROM_HEADER_BUF + 0x60); diff --git a/arm9/lib/NitroSDK/src/OS_spinLock.c b/arm9/lib/NitroSDK/src/OS_spinLock.c index 576e03adb..340ac7cdb 100644 --- a/arm9/lib/NitroSDK/src/OS_spinLock.c +++ b/arm9/lib/NitroSDK/src/OS_spinLock.c @@ -1,18 +1,14 @@ -// -// Created by red031000 on 2020-05-21. -// - #include "OS_spinLock.h" #include "OS_system.h" -#include "function_target.h" #include "mmap.h" #include "MI_exMemory.h" +#include "code32.h" extern void MIi_CpuClear32(u32 param1, void * addr, u32 length); //not too sure about names extern u32 MI_SwapWord(u32 data, volatile u32* destp); -ARM_FUNC void OS_InitLock(void) +void OS_InitLock(void) { static BOOL isInitialized = FALSE; @@ -46,7 +42,7 @@ ARM_FUNC void OS_InitLock(void) (void)OS_TryLockByWord(0x7f, lockp, NULL); } -ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFiq) { s32 lastLockFlag; @@ -57,12 +53,12 @@ ARM_FUNC s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) ( return lastLockFlag; } -ARM_FUNC s32 OS_TryLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void)) +s32 OS_TryLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void)) { return OSi_DoLockByWord(lockId, lockp, ctrlFuncp, FALSE); } -ARM_FUNC s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFIQ) { if (lockID != lockp->ownerID) @@ -88,12 +84,12 @@ ARM_FUNC s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) return 0; } -ARM_FUNC s32 OS_UnlockByWord(u16 lockID, OSLockWord* lockp, void (*ctrlFuncp) (void)) +s32 OS_UnlockByWord(u16 lockID, OSLockWord* lockp, void (*ctrlFuncp) (void)) { return OSi_DoUnlockByWord(lockID, lockp, ctrlFuncp, FALSE); } -ARM_FUNC s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), +s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void), BOOL disableFiq) { OSIntrMode lastIntrMode = (disableFiq) ? OS_DisableInterrupts_IrqAndFiq() : OS_DisableInterrupts(); @@ -121,63 +117,63 @@ ARM_FUNC s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp return lastLockFlag; } -ARM_FUNC s32 OS_LockCartridge(u16 lockID) +s32 OS_LockCartridge(u16 lockID) { return OSi_DoLockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_AllocateCartridgeBus, TRUE); } -ARM_FUNC s32 OS_UnlockCartridge(u16 lockID) +s32 OS_UnlockCartridge(u16 lockID) { return OSi_DoUnlockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_FreeCartridgeBus, TRUE); } -ARM_FUNC s32 OS_TryLockCartridge(u16 lockID) +s32 OS_TryLockCartridge(u16 lockID) { return OSi_DoTryLockByWord(lockID, (OSLockWord *)HW_CTRDG_LOCK_BUF, OSi_AllocateCartridgeBus, TRUE); } -ARM_FUNC void OSi_AllocateCartridgeBus(void) +void OSi_AllocateCartridgeBus(void) { MIi_SetCartridgeProcessor(MI_PROCESSOR_ARM9); } -ARM_FUNC void OSi_FreeCartridgeBus(void) +void OSi_FreeCartridgeBus(void) { MIi_SetCartridgeProcessor(MI_PROCESSOR_ARM7); } -ARM_FUNC s32 OS_TryLockCard(u16 lockID) +s32 OS_TryLockCard(u16 lockID) { return OS_TryLockByWord(lockID, (OSLockWord *)HW_CARD_LOCK_BUF, OSi_AllocateCardBus); } -ARM_FUNC s32 OS_UnlockCard(u16 lockID) +s32 OS_UnlockCard(u16 lockID) { return OS_UnlockByWord(lockID, (OSLockWord *)HW_CARD_LOCK_BUF, OSi_FreeCardBus); } -ARM_FUNC void OSi_AllocateCardBus(void) +void OSi_AllocateCardBus(void) { MIi_SetCardProcessor(MI_PROCESSOR_ARM9); } -ARM_FUNC void OSi_FreeCardBus(void) +void OSi_FreeCardBus(void) { MIi_SetCardProcessor(MI_PROCESSOR_ARM7); } -ARM_FUNC u16 OS_ReadOwnerOfLockWord(OSLockWord * lock) +u16 OS_ReadOwnerOfLockWord(OSLockWord * lock) { return lock->ownerID; } -ARM_FUNC asm s32 OS_UnLockCartridge(u16 lockID) +asm s32 OS_UnLockCartridge(u16 lockID) { ldr r1, =OS_UnlockCartridge bx r1 } -ARM_FUNC asm s32 OS_GetLockID(void) +asm s32 OS_GetLockID(void) { ldr r3, =HW_LOCK_ID_FLAG_MAIN ldr r1, [r3, #0x0] @@ -202,7 +198,7 @@ _020CA0D4: bx lr } -ARM_FUNC asm void OS_ReleaseLockID(register u16 lockID) +asm void OS_ReleaseLockID(register u16 lockID) { ldr r3, =HW_LOCK_ID_FLAG_MAIN cmp r0, #0x60 diff --git a/arm9/lib/NitroSDK/src/OS_system.c b/arm9/lib/NitroSDK/src/OS_system.c index f5f5faba8..81a578d7e 100644 --- a/arm9/lib/NitroSDK/src/OS_system.c +++ b/arm9/lib/NitroSDK/src/OS_system.c @@ -1,8 +1,9 @@ #include "OS_system.h" #include "OS_irqHandler.h" #include "syscall.h" +#include "code32.h" -ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) +asm OSIntrMode OS_EnableInterrupts(void) { mrs r0, cpsr bic r1, r0, #HW_PSR_DISABLE_IRQ @@ -11,7 +12,7 @@ ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) +asm OSIntrMode OS_DisableInterrupts(void) { mrs r0, cpsr orr r1, r0, #HW_PSR_DISABLE_IRQ @@ -20,7 +21,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) +asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { mrs r1, cpsr bic r2, r1, #HW_PSR_DISABLE_IRQ @@ -30,7 +31,7 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) +asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) { mrs r0, cpsr orr r1, r0, #HW_PSR_DISABLE_IRQ_FIQ @@ -39,7 +40,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) +asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) { mrs r1, cpsr bic r2, r1, #HW_PSR_DISABLE_IRQ_FIQ @@ -49,28 +50,28 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) bx lr } -ARM_FUNC asm OSIntrMode OS_GetCpsrIrq(void) +asm OSIntrMode OS_GetCpsrIrq(void) { mrs r0, cpsr and r0, r0, #HW_PSR_DISABLE_IRQ bx lr } -ARM_FUNC asm OSProcMode OS_GetProcMode(void) +asm OSProcMode OS_GetProcMode(void) { mrs r0, cpsr and r0, r0, #HW_PSR_CPU_MODE_MASK bx lr } -ARM_FUNC asm void OS_SpinWait(u32 cycles) +asm void OS_SpinWait(u32 cycles) { subs r0, r0, #0x4 bhs OS_SpinWait bx lr } -ARM_FUNC void OS_WaitVBlankIntr(void) +void OS_WaitVBlankIntr(void) { SVC_WaitByLoop(0x1); OS_WaitIrq(TRUE, OS_IE_V_BLANK); diff --git a/arm9/lib/NitroSDK/src/OS_tcm.c b/arm9/lib/NitroSDK/src/OS_tcm.c index 5b6ab5523..a8814f555 100644 --- a/arm9/lib/NitroSDK/src/OS_tcm.c +++ b/arm9/lib/NitroSDK/src/OS_tcm.c @@ -1,7 +1,8 @@ #include "OS_tcm.h" #include "function_target.h" +#include "code32.h" -ARM_FUNC asm u32 OS_GetDTCMAddress(void) { +asm u32 OS_GetDTCMAddress(void) { mrc p15, 0x0, r0, c9, c1, 0x0 //Data TCM Base ldr r1, =OSi_TCM_REGION_BASE_MASK and r0, r0, r1 diff --git a/arm9/lib/NitroSDK/src/OS_terminate_proc.c b/arm9/lib/NitroSDK/src/OS_terminate_proc.c index fdc4dbff1..c26d3afc7 100644 --- a/arm9/lib/NitroSDK/src/OS_terminate_proc.c +++ b/arm9/lib/NitroSDK/src/OS_terminate_proc.c @@ -1,8 +1,8 @@ #include "OS_terminate_proc.h" -#include "function_target.h" #include "OS_system.h" +#include "code32.h" -ARM_FUNC void OS_Terminate(void) +void OS_Terminate(void) { while (TRUE) { @@ -11,7 +11,7 @@ ARM_FUNC void OS_Terminate(void) } } -ARM_FUNC asm void OS_Halt(void) +asm void OS_Halt(void) { mov r0, #0x0 mcr p15, 0x0, r0, c7, c0, 0x4 //Wait For Interrupt (Halt) diff --git a/arm9/lib/NitroSDK/src/OS_thread.c b/arm9/lib/NitroSDK/src/OS_thread.c index a52b1f6d8..365c51405 100644 --- a/arm9/lib/NitroSDK/src/OS_thread.c +++ b/arm9/lib/NitroSDK/src/OS_thread.c @@ -1,4 +1,3 @@ -#include "function_target.h" #include "MI_memory.h" #include "OS_thread.h" #include "OS_mutex.h" @@ -8,6 +7,7 @@ #include "OS_terminate_proc.h" #include "systemWork.h" #include "mmap.h" +#include "code32.h" extern void SDK_SYS_STACKSIZE(void); extern void SDK_IRQ_STACKSIZE(void); @@ -46,12 +46,12 @@ static void OSi_CancelThreadAlarmForSleep(OSThread *thread); static void OSi_SleepAlarmCallback(void *arg); static void OSi_IdleThreadProc(void *); -ARM_FUNC static s32 OSi_GetUnusedThreadId(void) +static s32 OSi_GetUnusedThreadId(void) { return ++OSi_ThreadIdCount; } -ARM_FUNC static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread) +static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread) { OSThread *next = queue->head; @@ -98,7 +98,7 @@ ARM_FUNC static void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *threa } } -ARM_FUNC static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) +static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) { OSThread *thread = queue->head; @@ -122,7 +122,7 @@ ARM_FUNC static OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue) return thread; } -ARM_FUNC static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread) +static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread) { OSThread *queueHead = queue->head; @@ -161,7 +161,7 @@ ARM_FUNC static OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, return queueHead; } -ARM_FUNC OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) +OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) { OSMutex *mutexHead = queue->head; @@ -184,7 +184,7 @@ ARM_FUNC OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue) return mutexHead; } -ARM_FUNC static void OSi_InsertThreadToList(OSThread *thread) +static void OSi_InsertThreadToList(OSThread *thread) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -207,7 +207,7 @@ ARM_FUNC static void OSi_InsertThreadToList(OSThread *thread) } } -ARM_FUNC static void OSi_RemoveThreadFromList(OSThread *thread) +static void OSi_RemoveThreadFromList(OSThread *thread) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -228,7 +228,7 @@ ARM_FUNC static void OSi_RemoveThreadFromList(OSThread *thread) } } -ARM_FUNC static void OSi_RescheduleThread(void) +static void OSi_RescheduleThread(void) { if (OSi_RescheduleCount <= 0) { @@ -266,7 +266,7 @@ ARM_FUNC static void OSi_RescheduleThread(void) } } -ARM_FUNC void OS_InitThread(void) +void OS_InitThread(void) { if (OSi_IsThreadInitialized) return; @@ -313,14 +313,14 @@ ARM_FUNC void OS_InitThread(void) OSi_IdleThread.state = OS_THREAD_STATE_READY; } -ARM_FUNC asm BOOL OS_IsThreadAvailable(void) +asm BOOL OS_IsThreadAvailable(void) { ldr r0, =OSi_IsThreadInitialized ldr r0, [r0, #0] bx lr } -ARM_FUNC void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio) +void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg, void *stack, u32 stackSize, u32 prio) { OSIntrMode enable = OS_DisableInterrupts(); @@ -366,13 +366,13 @@ ARM_FUNC void OS_CreateThread(OSThread *thread, void (*func) (void *), void *arg (void)OS_RestoreInterrupts(enable); } -ARM_FUNC void OS_ExitThread(void) +void OS_ExitThread(void) { (void)OS_DisableInterrupts(); OSi_ExitThread_ArgSpecified(OS_GetCurrentThread(), 0); } -ARM_FUNC static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) +static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) { if (OSi_StackForDestructor) { @@ -388,7 +388,7 @@ ARM_FUNC static void OSi_ExitThread_ArgSpecified(OSThread *thread, void *arg) } } -ARM_FUNC static void OSi_ExitThread(void *arg) +static void OSi_ExitThread(void *arg) { OSThread *currentThread = OSi_GetCurrentThread(); OSThreadDestructor destructor = currentThread->destructor; @@ -403,7 +403,7 @@ ARM_FUNC static void OSi_ExitThread(void *arg) OSi_ExitThread_Destroy(); } -ARM_FUNC static void OSi_ExitThread_Destroy(void) +static void OSi_ExitThread_Destroy(void) { OSThread *currentThread = OSi_GetCurrentThread(); (void)OS_DisableScheduler(); @@ -428,7 +428,7 @@ ARM_FUNC static void OSi_ExitThread_Destroy(void) OS_Terminate(); } -ARM_FUNC void OS_DestroyThread(OSThread *thread) +void OS_DestroyThread(OSThread *thread) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -460,7 +460,7 @@ ARM_FUNC void OS_DestroyThread(OSThread *thread) OS_RescheduleThread(); } -ARM_FUNC static void OSi_CancelThreadAlarmForSleep(OSThread *thread) +static void OSi_CancelThreadAlarmForSleep(OSThread *thread) { OSAlarm *alarm = thread->alarmForSleep; @@ -470,7 +470,7 @@ ARM_FUNC static void OSi_CancelThreadAlarmForSleep(OSThread *thread) } } -ARM_FUNC void OS_JoinThread(OSThread *thread) +void OS_JoinThread(OSThread *thread) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -482,12 +482,12 @@ ARM_FUNC void OS_JoinThread(OSThread *thread) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC BOOL OS_IsThreadTerminated(const OSThread *thread) +BOOL OS_IsThreadTerminated(const OSThread *thread) { return (thread->state == OS_THREAD_STATE_TERMINATED) ? TRUE : FALSE; } -ARM_FUNC void OS_SleepThread(OSThreadQueue *queue) +void OS_SleepThread(OSThreadQueue *queue) { OSIntrMode enabled = OS_DisableInterrupts(); OSThread *currentThread = OSi_GetCurrentThread(); @@ -504,7 +504,7 @@ ARM_FUNC void OS_SleepThread(OSThreadQueue *queue) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_WakeupThread(OSThreadQueue *queue) +void OS_WakeupThread(OSThreadQueue *queue) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -526,7 +526,7 @@ ARM_FUNC void OS_WakeupThread(OSThreadQueue *queue) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_WakeupThreadDirect(OSThread *thread) +void OS_WakeupThreadDirect(OSThread *thread) { OSIntrMode enabled = OS_DisableInterrupts(); @@ -536,7 +536,7 @@ ARM_FUNC void OS_WakeupThreadDirect(OSThread *thread) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC OSThread *OS_SelectThread(void) +OSThread *OS_SelectThread(void) { OSThread *thread = OSi_ThreadInfo.list; @@ -548,14 +548,14 @@ ARM_FUNC OSThread *OS_SelectThread(void) return thread; } -ARM_FUNC void OS_RescheduleThread(void) +void OS_RescheduleThread(void) { OSIntrMode enabled = OS_DisableInterrupts(); OSi_RescheduleThread(); (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void OS_YieldThread(void) +void OS_YieldThread(void) { OSThread *current = OS_GetCurrentThread(); OSThread *pre = NULL; @@ -606,7 +606,7 @@ ARM_FUNC void OS_YieldThread(void) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) +BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) { OSThread *t = OSi_ThreadInfo.list; OSThread *pre = NULL; @@ -646,12 +646,12 @@ ARM_FUNC BOOL OS_SetThreadPriority(OSThread *thread, u32 prio) return TRUE; } -ARM_FUNC u32 OS_GetThreadPriority(const OSThread *thread) +u32 OS_GetThreadPriority(const OSThread *thread) { return thread->priority; } -ARM_FUNC void OS_Sleep(u32 msec) +void OS_Sleep(u32 msec) { OSAlarm alarm; @@ -670,7 +670,7 @@ ARM_FUNC void OS_Sleep(u32 msec) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC static void OSi_SleepAlarmCallback(void *arg) +static void OSi_SleepAlarmCallback(void *arg) { OSThread **pp_thread = (OSThread **)arg; OSThread *p_thread = *pp_thread; @@ -681,7 +681,7 @@ ARM_FUNC static void OSi_SleepAlarmCallback(void *arg) OS_WakeupThreadDirect(p_thread); } -ARM_FUNC OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback) +OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callback) { OSIntrMode enabled = OS_DisableInterrupts(); OSSwitchThreadCallback prev = OSi_ThreadInfo.switchCallback; @@ -691,8 +691,9 @@ ARM_FUNC OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallbac return prev; } -ARM_FUNC static void OSi_IdleThreadProc(void *) +static void OSi_IdleThreadProc(void *unused) { +#pragma unused(unused) (void)OS_EnableInterrupts(); while (1) { @@ -700,7 +701,7 @@ ARM_FUNC static void OSi_IdleThreadProc(void *) } } -ARM_FUNC u32 OS_DisableScheduler(void) +u32 OS_DisableScheduler(void) { OSIntrMode enabled = OS_DisableInterrupts(); u32 count; @@ -714,7 +715,7 @@ ARM_FUNC u32 OS_DisableScheduler(void) return count; } -ARM_FUNC u32 OS_EnableScheduler(void) +u32 OS_EnableScheduler(void) { OSIntrMode enabled = OS_DisableInterrupts(); u32 count = 0; @@ -728,7 +729,7 @@ ARM_FUNC u32 OS_EnableScheduler(void) return count; } -ARM_FUNC void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor) +void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor) { thread->destructor = dtor; } diff --git a/arm9/lib/NitroSDK/src/OS_tick.c b/arm9/lib/NitroSDK/src/OS_tick.c index b0e810540..80cab8bb0 100644 --- a/arm9/lib/NitroSDK/src/OS_tick.c +++ b/arm9/lib/NitroSDK/src/OS_tick.c @@ -1,8 +1,8 @@ -#include "function_target.h" #include "OS_tick.h" #include "OS_interrupt.h" #include "OS_timer.h" #include "OS_system.h" +#include "code32.h" static u16 OSi_UseTick = FALSE; vu64 OSi_TickCounter; @@ -10,7 +10,7 @@ BOOL OSi_NeedResetTimer = FALSE; static void OSi_CountUpTick(void); -ARM_FUNC void OS_InitTick(void) +void OS_InitTick(void) { if (OSi_UseTick) { @@ -27,12 +27,12 @@ ARM_FUNC void OS_InitTick(void) OSi_NeedResetTimer = FALSE; } -ARM_FUNC BOOL OS_IsTickAvailable(void) +BOOL OS_IsTickAvailable(void) { return OSi_UseTick; } -ARM_FUNC static void OSi_CountUpTick(void) +static void OSi_CountUpTick(void) { OSi_TickCounter++; @@ -48,7 +48,7 @@ ARM_FUNC static void OSi_CountUpTick(void) OSi_EnterTimerCallback(OS_TIMER_0, (void (*)(void *))OSi_CountUpTick, 0); } -ARM_FUNC OSTick OS_GetTick(void) +OSTick OS_GetTick(void) { OSIntrMode prev = OS_DisableInterrupts(); vu16 countL = *(REGType16 *)((u32)®_OS_TM0CNT_L + OS_TIMER_0 * 4); @@ -64,7 +64,7 @@ ARM_FUNC OSTick OS_GetTick(void) return (countH << 16) | countL; } -ARM_FUNC u16 OS_GetTickLo(void) +u16 OS_GetTickLo(void) { return reg_OS_TM0CNT_L; } diff --git a/arm9/lib/NitroSDK/src/OS_timer.c b/arm9/lib/NitroSDK/src/OS_timer.c index 69a1a6cdb..d2a25cf97 100644 --- a/arm9/lib/NitroSDK/src/OS_timer.c +++ b/arm9/lib/NitroSDK/src/OS_timer.c @@ -1,9 +1,10 @@ #include "OS_timer.h" #include "function_target.h" +#include "code32.h" static u16 OSi_TimerReserved = 0; -ARM_FUNC void OSi_SetTimerReserved(s32 timerNum) +void OSi_SetTimerReserved(s32 timerNum) { OSi_TimerReserved |= (1 << timerNum); } diff --git a/arm9/lib/NitroSDK/src/OS_valarm.c b/arm9/lib/NitroSDK/src/OS_valarm.c index 37329147c..5a5db7b84 100644 --- a/arm9/lib/NitroSDK/src/OS_valarm.c +++ b/arm9/lib/NitroSDK/src/OS_valarm.c @@ -1,6 +1,6 @@ #include "OS_valarm.h" -#include "function_target.h" #include "OS_interrupt.h" +#include "code32.h" static struct OSiVAlarmQueue { @@ -13,7 +13,7 @@ static u16 OSi_UseVAlarm = FALSE; static s32 OSi_VFrameCount; static s32 OSi_PreviousVCount; -ARM_FUNC void OS_InitVAlarm(void) +void OS_InitVAlarm(void) { if (!OSi_UseVAlarm) { diff --git a/arm9/lib/NitroSDK/src/OS_vramExclusive.c b/arm9/lib/NitroSDK/src/OS_vramExclusive.c index 5ce10f4ac..cef3438e0 100644 --- a/arm9/lib/NitroSDK/src/OS_vramExclusive.c +++ b/arm9/lib/NitroSDK/src/OS_vramExclusive.c @@ -1,19 +1,19 @@ #include "OS_vramExclusive.h" -#include "function_target.h" #include "OS_system.h" +#include "code32.h" static u32 OSi_vramExclusive; static u16 OSi_vramLockId[9]; static u32 OsCountZeroBits(register u32 bitmap); -ARM_FUNC static asm u32 OsCountZeroBits(register u32 bitmap) +static asm u32 OsCountZeroBits(register u32 bitmap) { clz r0, r0 bx lr } -ARM_FUNC void OSi_InitVramExclusive(void) +void OSi_InitVramExclusive(void) { OSi_vramExclusive = 0x0000; @@ -23,7 +23,7 @@ ARM_FUNC void OSi_InitVramExclusive(void) } } -ARM_FUNC BOOL OSi_TryLockVram(u16 bank, u16 lockId) +BOOL OSi_TryLockVram(u16 bank, u16 lockId) { u32 workMap; s32 zeroBits; @@ -62,7 +62,7 @@ ARM_FUNC BOOL OSi_TryLockVram(u16 bank, u16 lockId) return TRUE; } -ARM_FUNC void OSi_UnlockVram(u16 bank, u16 lockId) +void OSi_UnlockVram(u16 bank, u16 lockId) { u32 workMap; s32 zeroBits; diff --git a/arm9/lib/NitroSDK/src/PXI_fifo.c b/arm9/lib/NitroSDK/src/PXI_fifo.c index 35db1c7fd..95e80be1b 100644 --- a/arm9/lib/NitroSDK/src/PXI_fifo.c +++ b/arm9/lib/NitroSDK/src/PXI_fifo.c @@ -1,16 +1,16 @@ -#include "function_target.h" #include "consts.h" #include "OS_interrupt.h" #include "OS_system.h" #include "PXI_fifo.h" #include "systemWork.h" +#include "code32.h" static u16 FifoCtrlInit = 0; static PXIFifoCallback FifoRecvCallbackTable[PXI_MAX_FIFO_TAG]; static inline PXIFifoStatus PXIi_SetToFifo(u32 data); -ARM_FUNC void PXI_InitFifo(void) +void PXI_InitFifo(void) { OSSystemWork *p = OS_GetSystemWork(); OSIntrMode enabled = OS_DisableInterrupts(); @@ -62,7 +62,7 @@ ARM_FUNC void PXI_InitFifo(void) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback) +void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback) { OSSystemWork *p = OS_GetSystemWork(); OSIntrMode enabled = OS_DisableInterrupts(); @@ -79,14 +79,14 @@ ARM_FUNC void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback) (void)OS_RestoreInterrupts(enabled); } -ARM_FUNC BOOL PXI_IsCallbackReady(s32 fifotag, PXIProc proc) +BOOL PXI_IsCallbackReady(s32 fifotag, PXIProc proc) { OSSystemWork *p = OS_GetSystemWork(); return (p->pxiHandleChecker[proc] & (1UL << fifotag)) ? TRUE : FALSE; } -ARM_FUNC s32 PXI_SendWordByFifo(s32 fifotag, u32 data, BOOL err) +s32 PXI_SendWordByFifo(s32 fifotag, u32 data, BOOL err) { PXIFifoMessage fifomsg; @@ -139,7 +139,7 @@ static inline PXIFifoStatus PXIi_GetFromFifo(u32 *data_buf) return PXI_FIFO_SUCCESS; } -ARM_FUNC void PXIi_HandlerRecvFifoNotEmpty(void) +void PXIi_HandlerRecvFifoNotEmpty(void) { PXIFifoMessage fifomsg; PXIFifoStatus ret_code; diff --git a/arm9/lib/NitroSDK/src/PXI_init.c b/arm9/lib/NitroSDK/src/PXI_init.c index d70ca3b01..eb6bbd65e 100644 --- a/arm9/lib/NitroSDK/src/PXI_init.c +++ b/arm9/lib/NitroSDK/src/PXI_init.c @@ -1,8 +1,8 @@ #include "PXI_init.h" #include "PXI_fifo.h" -#include "function_target.h" +#include "code32.h" -ARM_FUNC void PXI_Init(void) +void PXI_Init(void) { PXI_InitFifo(); } diff --git a/arm9/lib/NitroSDK/src/RTC_convert.c b/arm9/lib/NitroSDK/src/RTC_convert.c index 3d0bb2ce0..c82c849a2 100644 --- a/arm9/lib/NitroSDK/src/RTC_convert.c +++ b/arm9/lib/NitroSDK/src/RTC_convert.c @@ -1,6 +1,7 @@ -#include "global.h" +#include "nitro/types.h" #include "RTC_api.h" #include "RTC_convert.h" +#include "code32.h" static s32 sDayOfYear[12] = { 0, // Jan diff --git a/arm9/lib/NitroSDK/src/RTC_internal.c b/arm9/lib/NitroSDK/src/RTC_internal.c index e3a132abf..b878b9b96 100644 --- a/arm9/lib/NitroSDK/src/RTC_internal.c +++ b/arm9/lib/NitroSDK/src/RTC_internal.c @@ -1,30 +1,30 @@ -#include "function_target.h" #include "PXI_fifo.h" #include "RTC_internal.h" +#include "code32.h" static BOOL RtcSendPxiCommand(u8 command); -ARM_FUNC BOOL RTCi_ReadRawDateTimeAsync(void) +BOOL RTCi_ReadRawDateTimeAsync(void) { return RtcSendPxiCommand(16); } -ARM_FUNC BOOL RTCi_ReadRawDateAsync(void) +BOOL RTCi_ReadRawDateAsync(void) { return RtcSendPxiCommand(17); } -ARM_FUNC BOOL RTCi_ReadRawTimeAsync(void) +BOOL RTCi_ReadRawTimeAsync(void) { return RtcSendPxiCommand(18); } -ARM_FUNC BOOL RTCi_WriteRawStatus2Async(void) +BOOL RTCi_WriteRawStatus2Async(void) { return RtcSendPxiCommand(39); } -ARM_FUNC static BOOL RtcSendPxiCommand(u8 command) +static BOOL RtcSendPxiCommand(u8 command) { s32 data = command << 8 & 0x7f00; return PXI_SendWordByFifo(PXI_FIFO_TAG_RTC, (u32)data, FALSE) >= 0; diff --git a/arm9/lib/NitroSDK/src/SND_alarm.c b/arm9/lib/NitroSDK/src/SND_alarm.c index e216c02c3..7ee41522a 100644 --- a/arm9/lib/NitroSDK/src/SND_alarm.c +++ b/arm9/lib/NitroSDK/src/SND_alarm.c @@ -1,4 +1,6 @@ #include "SND_alarm.h" +#include "nitro/types.h" +#include "code32.h" struct AlarmCallback { SNDAlarmCallback cb; @@ -9,7 +11,7 @@ struct AlarmCallback { static struct AlarmCallback sCallbackTable[SND_ALARM_COUNT]; -ARM_FUNC void SND_AlarmInit(void) { +void SND_AlarmInit(void) { for (s32 i = 0; i < SND_ALARM_COUNT; i++) { sCallbackTable[i].cb = NULL; sCallbackTable[i].data = NULL; @@ -17,12 +19,12 @@ ARM_FUNC void SND_AlarmInit(void) { } } -ARM_FUNC void SNDi_IncAlarmId(u32 idx) { +void SNDi_IncAlarmId(u32 idx) { struct AlarmCallback *ac = &sCallbackTable[idx]; ac->id++; } -ARM_FUNC u8 SNDi_SetAlarmHandler(u32 idx, SNDAlarmCallback cb, void *data) { +u8 SNDi_SetAlarmHandler(u32 idx, SNDAlarmCallback cb, void *data) { struct AlarmCallback *ac = &sCallbackTable[idx]; ac->cb = cb; ac->data = data; @@ -30,7 +32,7 @@ ARM_FUNC u8 SNDi_SetAlarmHandler(u32 idx, SNDAlarmCallback cb, void *data) { return ac->id; } -ARM_FUNC void SNDi_CallAlarmHandler(s32 idx) { +void SNDi_CallAlarmHandler(s32 idx) { struct AlarmCallback *ac = &sCallbackTable[idx & 0xFF]; if (((idx >> 8) & 0xFF) != ac->id) return; diff --git a/arm9/lib/NitroSDK/src/SND_bank.c b/arm9/lib/NitroSDK/src/SND_bank.c index 440754545..09a12dcca 100644 --- a/arm9/lib/NitroSDK/src/SND_bank.c +++ b/arm9/lib/NitroSDK/src/SND_bank.c @@ -1,5 +1,7 @@ #include "SND_bank.h" #include "OS_mutex.h" +#include "nitro/types.h" +#include "code32.h" void DC_StoreRange(const void *, u32); @@ -18,7 +20,7 @@ void DC_StoreRange(const void *, u32); /* * Set bank's wavearc link at index to specified wavearc */ -ARM_FUNC void SND_AssignWaveArc(struct SNDBankData *bankData, s32 index, struct SNDWaveArc *waveArc) { +void SND_AssignWaveArc(struct SNDBankData *bankData, s32 index, struct SNDWaveArc *waveArc) { SNDi_LockMutex(); struct SNDWaveArc *selectedWaveArc = bankData->waveArcLinks[index].waveArc; if (selectedWaveArc != NULL) { @@ -50,7 +52,7 @@ ARM_FUNC void SND_AssignWaveArc(struct SNDBankData *bankData, s32 index, struct DC_StoreRange(waveArc, sizeof(*waveArc)); } -ARM_FUNC void SND_DestroyBank(struct SNDBankData *bankData) { +void SND_DestroyBank(struct SNDBankData *bankData) { SNDi_LockMutex(); for (s32 i = 0; i < SND_BANK_MAX_WAVEARC; i++) { @@ -77,7 +79,7 @@ ARM_FUNC void SND_DestroyBank(struct SNDBankData *bankData) { SNDi_UnlockMutex(); } -ARM_FUNC void SND_DestroyWaveArc(struct SNDWaveArc *waveArc) { +void SND_DestroyWaveArc(struct SNDWaveArc *waveArc) { SNDi_LockMutex(); struct SNDWaveArcLink *cur = waveArc->waveArcLLHead; @@ -92,7 +94,7 @@ ARM_FUNC void SND_DestroyWaveArc(struct SNDWaveArc *waveArc) { SNDi_UnlockMutex(); } -ARM_FUNC struct SNDInstPos SND_GetFirstInstDataPos(const struct SNDBankData *bankData) { +struct SNDInstPos SND_GetFirstInstDataPos(const struct SNDBankData *bankData) { #pragma unused (bankData) struct SNDInstPos retval; retval.program = 0; @@ -100,11 +102,11 @@ ARM_FUNC struct SNDInstPos SND_GetFirstInstDataPos(const struct SNDBankData *ban return retval; } -ARM_FUNC static inline struct SNDDrumSet *test(const struct SNDBankData *bank, u32 off) { +static inline struct SNDDrumSet *test(const struct SNDBankData *bank, u32 off) { return (struct SNDDrumSet *)((u8 *)bank + (off >> 8)); } -ARM_FUNC BOOL SND_GetNextInstData(const struct SNDBankData *bankData, struct SNDInstData *instData, struct SNDInstPos *instPos) { +BOOL SND_GetNextInstData(const struct SNDBankData *bankData, struct SNDInstData *instData, struct SNDInstPos *instPos) { while (instPos->program < bankData->instCount) { struct SNDDrumSet *drums; struct SNDKeySplit *keySplit; @@ -148,18 +150,18 @@ ARM_FUNC BOOL SND_GetNextInstData(const struct SNDBankData *bankData, struct SND return FALSE; } -ARM_FUNC u32 SND_GetWaveDataCount(const struct SNDWaveArc *waveArc) { +u32 SND_GetWaveDataCount(const struct SNDWaveArc *waveArc) { return waveArc->waveCount; } -ARM_FUNC void SND_SetWaveDataAddress(struct SNDWaveArc *waveArc, s32 index, const struct SNDWaveData *waveData) { +void SND_SetWaveDataAddress(struct SNDWaveArc *waveArc, s32 index, const struct SNDWaveData *waveData) { SNDi_LockMutex(); waveArc->waveOffsets[index] = (u32)waveData; DC_StoreRange(&waveArc->waveOffsets[index], sizeof(u32)); SNDi_UnlockMutex(); } -ARM_FUNC const struct SNDWaveData *SND_GetWaveDataAddress(const struct SNDWaveArc *waveArc, s32 index) { +const struct SNDWaveData *SND_GetWaveDataAddress(const struct SNDWaveArc *waveArc, s32 index) { SNDi_LockMutex(); u32 retval = waveArc->waveOffsets[index]; if (retval != 0) { diff --git a/arm9/lib/NitroSDK/src/SND_command.c b/arm9/lib/NitroSDK/src/SND_command.c index 044d960f5..58d266c5c 100644 --- a/arm9/lib/NitroSDK/src/SND_command.c +++ b/arm9/lib/NitroSDK/src/SND_command.c @@ -5,6 +5,7 @@ #include "OS_system.h" #include "OS_cache.h" #include "PXI_fifo.h" +#include "code32.h" #define SND_CMD_WAIT_QUEUE_COUNT 8 @@ -26,7 +27,7 @@ static void RequestCommandProc(void); static struct SNDCommand *AllocCommand(void); static BOOL IsCommandAvailable(void); -ARM_FUNC void SND_CommandInit(void) { +void SND_CommandInit(void) { InitPXI(); sFreeList = sCommandArray; for (int i = 0; i < SND_CMD_COUNT - 1; i++) { @@ -54,7 +55,7 @@ ARM_FUNC void SND_CommandInit(void) { (void)SND_FlushCommand(SND_CMD_FLAG_BLOCK); } -ARM_FUNC const struct SNDCommand *SND_RecvCommandReply(u32 flags) { +const struct SNDCommand *SND_RecvCommandReply(u32 flags) { OSIntrMode oldirq = OS_DisableInterrupts(); if (flags & SND_CMD_FLAG_BLOCK) { @@ -96,7 +97,7 @@ ARM_FUNC const struct SNDCommand *SND_RecvCommandReply(u32 flags) { return queueRead; } -ARM_FUNC struct SNDCommand *SND_AllocCommand(u32 flags) { +struct SNDCommand *SND_AllocCommand(u32 flags) { struct SNDCommand *cmd; if (!IsCommandAvailable()) return NULL; @@ -127,7 +128,7 @@ ARM_FUNC struct SNDCommand *SND_AllocCommand(u32 flags) { return cmd; } -ARM_FUNC void SND_PushCommand(struct SNDCommand *cmd) { +void SND_PushCommand(struct SNDCommand *cmd) { OSIntrMode oldirq = OS_DisableInterrupts(); struct SNDCommand *newend = cmd; @@ -144,7 +145,7 @@ ARM_FUNC void SND_PushCommand(struct SNDCommand *cmd) { (void)OS_RestoreInterrupts(oldirq); } -ARM_FUNC BOOL SND_FlushCommand(u32 flags) { +BOOL SND_FlushCommand(u32 flags) { OSIntrMode oldirq = OS_DisableInterrupts(); if (sReserveList == NULL) { @@ -200,7 +201,7 @@ ARM_FUNC BOOL SND_FlushCommand(u32 flags) { return TRUE; } -ARM_FUNC void SND_WaitForCommandProc(u32 tag) { +void SND_WaitForCommandProc(u32 tag) { if (SND_IsFinishedCommandTag(tag)) return; @@ -219,7 +220,7 @@ ARM_FUNC void SND_WaitForCommandProc(u32 tag) { } while (SND_IsFinishedCommandTag(tag) == 0); } -ARM_FUNC u32 SND_GetCurrentCommandTag(void) { +u32 SND_GetCurrentCommandTag(void) { OSIntrMode oldirq = OS_DisableInterrupts(); u32 retval; @@ -232,7 +233,7 @@ ARM_FUNC u32 SND_GetCurrentCommandTag(void) { return retval; } -ARM_FUNC BOOL SND_IsFinishedCommandTag(u32 tag) { +BOOL SND_IsFinishedCommandTag(u32 tag) { OSIntrMode oldirq = OS_DisableInterrupts(); BOOL result; @@ -252,7 +253,7 @@ ARM_FUNC BOOL SND_IsFinishedCommandTag(u32 tag) { return result; } -ARM_FUNC s32 SND_CountFreeCommand(void) { +s32 SND_CountFreeCommand(void) { OSIntrMode oldirq = OS_DisableInterrupts(); s32 count = 0; @@ -263,7 +264,7 @@ ARM_FUNC s32 SND_CountFreeCommand(void) { return count; } -ARM_FUNC s32 SND_CountReservedCommand(void) { +s32 SND_CountReservedCommand(void) { OSIntrMode oldirq = OS_DisableInterrupts(); s32 count = 0; @@ -274,18 +275,18 @@ ARM_FUNC s32 SND_CountReservedCommand(void) { return count; } -ARM_FUNC s32 SND_CountWaitingCommand(void) { +s32 SND_CountWaitingCommand(void) { return SND_CMD_COUNT - SND_CountFreeCommand() - SND_CountReservedCommand(); } -ARM_FUNC static void PxiFifoCallback(PXIFifoTag tag, u32 data, BOOL) { +static void PxiFifoCallback(PXIFifoTag tag, u32 data, BOOL) { #pragma unused (tag) OSIntrMode oldirq = OS_DisableInterrupts(); SNDi_CallAlarmHandler((s32)data); (void)OS_RestoreInterrupts(oldirq); } -ARM_FUNC static void InitPXI(void) { +static void InitPXI(void) { PXI_SetFifoRecvCallback(PXI_FIFO_TAG_SOUND, PxiFifoCallback); if (!IsCommandAvailable()) @@ -299,11 +300,11 @@ ARM_FUNC static void InitPXI(void) { } while (!PXI_IsCallbackReady(PXI_FIFO_TAG_SOUND, PXI_PROC_ARM7)); } -ARM_FUNC static void RequestCommandProc(void) { +static void RequestCommandProc(void) { while (PXI_SendWordByFifo(7, 0, 0) < 0) { } } -ARM_FUNC static struct SNDCommand *AllocCommand(void) { +static struct SNDCommand *AllocCommand(void) { OSIntrMode oldirq = OS_DisableInterrupts(); if (sFreeList == NULL) { (void)OS_RestoreInterrupts(oldirq); @@ -319,7 +320,7 @@ ARM_FUNC static struct SNDCommand *AllocCommand(void) { return retval; } -ARM_FUNC static BOOL IsCommandAvailable(void) { +static BOOL IsCommandAvailable(void) { if (!OS_IsRunOnEmulator()) return TRUE; diff --git a/arm9/lib/NitroSDK/src/SND_interface.c b/arm9/lib/NitroSDK/src/SND_interface.c index 42b5ff428..58c907041 100644 --- a/arm9/lib/NitroSDK/src/SND_interface.c +++ b/arm9/lib/NitroSDK/src/SND_interface.c @@ -1,5 +1,7 @@ #include "SND_interface.h" #include "SND_command.h" +#include "nitro/types.h" +#include "code32.h" static void PushCommand_impl(s32 id, u32 par1, u32 par2, u32 par3, u32 par4); #define PushCmd1(id, a) PushCommand_impl(id, (u32)(a), 0, 0, 0) @@ -9,57 +11,57 @@ static void PushCommand_impl(s32 id, u32 par1, u32 par2, u32 par3, u32 par4); // TODO fill in "random" constants with macros -// ARM_FUNC void SND_StartSeq(s32 player, const void *seqBasePtr, u32 seqOffset, struct SNDBankData *bankData) { } +// void SND_StartSeq(s32 player, const void *seqBasePtr, u32 seqOffset, struct SNDBankData *bankData) { } -ARM_FUNC void SND_StopSeq(s32 player) { +void SND_StopSeq(s32 player) { PushCmd1(SND_CMD_STOP_SEQ, player); } -ARM_FUNC void SND_PrepareSeq(s32 player, const void *seqBasePtr, u32 seqOffset, struct SNDBankData *bankData) { +void SND_PrepareSeq(s32 player, const void *seqBasePtr, u32 seqOffset, struct SNDBankData *bankData) { PushCmd4(SND_CMD_PREPARE_SEQ, player, seqBasePtr, seqOffset, bankData); } -ARM_FUNC void SND_StartPreparedSeq(s32 player) { +void SND_StartPreparedSeq(s32 player) { PushCmd1(SND_CMD_START_PREPARED_SEQ, player); } -ARM_FUNC void SND_PauseSeq(s32 player, BOOL flag) { +void SND_PauseSeq(s32 player, BOOL flag) { PushCmd2(SND_CMD_PAUSE_SEQ, player, flag); } -// ARM_FUNC void SND_SetPlayerTempoRatio(s32 player, s32 ratio) { } +// void SND_SetPlayerTempoRatio(s32 player, s32 ratio) { } -ARM_FUNC void SND_SetPlayerVolume(s32 player, s32 volume) { +void SND_SetPlayerVolume(s32 player, s32 volume) { SNDi_SetPlayerParam(player, 6, (u32)volume, 2); } -ARM_FUNC void SND_SetPlayerChannelPriority(s32 player, s32 prio) { +void SND_SetPlayerChannelPriority(s32 player, s32 prio) { SNDi_SetPlayerParam(player, 4, (u32)prio, 1); } -// ARM_FUNC void SND_SetPlayerLocalVariable(s32 player, s32 varNo, s16 var) { } +// void SND_SetPlayerLocalVariable(s32 player, s32 varNo, s16 var) { } -// ARM_FUNC void SND_SetPlayerGlobalVariable(s32 varNo, s16 var) { } +// void SND_SetPlayerGlobalVariable(s32 varNo, s16 var) { } -// ARM_FUNC void SND_SetTrackVolume(s32 player, u32 trackBitMask, s32 volume) { } +// void SND_SetTrackVolume(s32 player, u32 trackBitMask, s32 volume) { } -ARM_FUNC void SND_SetTrackPitch(s32 player, u32 trackBitMask, s32 pitch) { +void SND_SetTrackPitch(s32 player, u32 trackBitMask, s32 pitch) { SNDi_SetTrackParam(player, trackBitMask, 12, (u32)pitch, 2); } -ARM_FUNC void SND_SetTrackPan(s32 player, u32 trackBitMask, s32 pan) { +void SND_SetTrackPan(s32 player, u32 trackBitMask, s32 pan) { SNDi_SetTrackParam(player, trackBitMask, 9, (u32)pan, 1); } -ARM_FUNC void SND_SetTrackAllocatableChannel(s32 player, u32 trackBitMask, u32 chnBitMask) { +void SND_SetTrackAllocatableChannel(s32 player, u32 trackBitMask, u32 chnBitMask) { PushCmd3(SND_CMD_ALLOCATABLE_CHANNEL, player, trackBitMask, chnBitMask); } -ARM_FUNC void SND_StartTimer(u32 chnBitMask, u32 capBitMask, u32 alarmBitMask, u32 flags) { +void SND_StartTimer(u32 chnBitMask, u32 capBitMask, u32 alarmBitMask, u32 flags) { PushCmd4(SND_CMD_START_TIMER, chnBitMask, capBitMask, alarmBitMask, flags); } -ARM_FUNC void SND_StopTimer(u32 chnBitMask, u32 capBitMask, u32 alarmBitMask, u32 flags) { +void SND_StopTimer(u32 chnBitMask, u32 capBitMask, u32 alarmBitMask, u32 flags) { s32 i = 0; u32 tmpMask = alarmBitMask; @@ -73,40 +75,40 @@ ARM_FUNC void SND_StopTimer(u32 chnBitMask, u32 capBitMask, u32 alarmBitMask, u3 PushCmd4(SND_CMD_STOP_TIMER, chnBitMask, capBitMask, alarmBitMask, flags); } -ARM_FUNC void SND_SetupCapture(s32 capture, s32 format, void *bufferPtr, u32 length, BOOL loopFlag, s32 in, s32 out) { +void SND_SetupCapture(s32 capture, s32 format, void *bufferPtr, u32 length, BOOL loopFlag, s32 in, s32 out) { PushCmd3(SND_CMD_SETUP_CAPTURE, bufferPtr, length, (capture << 31) | (format << 30) | (loopFlag << 29) | (in << 28) | (out << 27)); } -ARM_FUNC void SND_SetupAlarm(s32 alarm, u32 tick, u32 period, SNDAlarmCallback cb, void *userData) { +void SND_SetupAlarm(s32 alarm, u32 tick, u32 period, SNDAlarmCallback cb, void *userData) { PushCmd4(SND_CMD_SETUP_ALARM, alarm, tick, period, SNDi_SetAlarmHandler((u32)alarm, cb, userData)); } -// ARM_FUNC void SND_SetTrackMute(s32 player, u32 trackBitMask, BOOL flag) { } +// void SND_SetTrackMute(s32 player, u32 trackBitMask, BOOL flag) { } -// ARM_FUNC void SND_StopUnlockedChannel(u32 chnBitMask, u32 flags) { } +// void SND_StopUnlockedChannel(u32 chnBitMask, u32 flags) { } -ARM_FUNC void SND_LockChannel(u32 chnBitMask, u32 flags) { +void SND_LockChannel(u32 chnBitMask, u32 flags) { PushCmd2(SND_CMD_LOCK_CHANNEL, chnBitMask, flags); } -ARM_FUNC void SND_UnlockChannel(u32 chnBitMask, u32 flags) { +void SND_UnlockChannel(u32 chnBitMask, u32 flags) { PushCmd2(SND_CMD_UNLOCK_CHANNEL, chnBitMask, flags); } -ARM_FUNC void SND_SetChannelTimer(u32 chnBitMask, s32 timer) { +void SND_SetChannelTimer(u32 chnBitMask, s32 timer) { PushCmd2(SND_CMD_CHANNEL_TIMER, chnBitMask, timer); } -ARM_FUNC void SND_SetChannelVolume(u32 chnBitMask, s32 volume, s32 chnDataShift) { +void SND_SetChannelVolume(u32 chnBitMask, s32 volume, s32 chnDataShift) { PushCmd3(SND_CMD_CHANNEL_VOLUME, chnBitMask, volume, chnDataShift); } -ARM_FUNC void SND_SetChannelPan(u32 chnBitMask, s32 pan) { +void SND_SetChannelPan(u32 chnBitMask, s32 pan) { PushCmd2(SND_CMD_CHANNEL_PAN, chnBitMask, pan); } -ARM_FUNC void SND_SetupChannelPcm(s32 chn, s32 waveFormat, const void *dataAddr, s32 loopMode, s32 loopStart, s32 dataLen, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { +void SND_SetupChannelPcm(s32 chn, s32 waveFormat, const void *dataAddr, s32 loopMode, s32 loopStart, s32 dataLen, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { PushCmd4(SND_CMD_SETUP_CHANNEL_PCM, chn | (timer << 16), dataAddr, @@ -114,51 +116,51 @@ ARM_FUNC void SND_SetupChannelPcm(s32 chn, s32 waveFormat, const void *dataAddr, (loopMode << 26) | (waveFormat << 24) | (pan << 16) | loopStart); } -// ARM_FUNC void SND_SetupChannelPsg(s32 chn, s32 sndDuty, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { } +// void SND_SetupChannelPsg(s32 chn, s32 sndDuty, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { } -// ARM_FUNC void SND_SetupChannelNoise(s32 chn, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { } +// void SND_SetupChannelNoise(s32 chn, s32 volume, s32 chnDataShift, s32 timer, s32 pan) { } -ARM_FUNC void SND_InvalidateSeqData(const void *start, const void *end) { +void SND_InvalidateSeqData(const void *start, const void *end) { PushCmd2(SND_CMD_INVALIDATE_SEQ, start, end); } -ARM_FUNC void SND_InvalidateBankData(const void *start, const void *end) { +void SND_InvalidateBankData(const void *start, const void *end) { PushCmd2(SND_CMD_INVALIDATE_BANK, start, end); } -ARM_FUNC void SND_InvalidateWaveData(const void *start, const void *end) { +void SND_InvalidateWaveData(const void *start, const void *end) { PushCmd2(SND_CMD_INVALIDATE_WAVE, start, end); } -// ARM_FUNC void SND_SetMasterVolume(s32 volume) { } +// void SND_SetMasterVolume(s32 volume) { } -ARM_FUNC void SND_SetOutputSelector(s32 left, s32 right, s32 channel1, s32 channel3) { +void SND_SetOutputSelector(s32 left, s32 right, s32 channel1, s32 channel3) { PushCmd4(SND_CMD_OUTPUT_SELECTOR, left, right, channel1, channel3); } -ARM_FUNC void SND_SetMasterPan(s32 pan) { +void SND_SetMasterPan(s32 pan) { PushCmd1(SND_CMD_MASTER_PAN, pan); } -ARM_FUNC void SND_ResetMasterPan(void) { +void SND_ResetMasterPan(void) { PushCmd1(SND_CMD_MASTER_PAN, -1); } -// ARM_FUNC void SND_ReadDriverInfo(struct SNDDriverInfo *info) { } +// void SND_ReadDriverInfo(struct SNDDriverInfo *info) { } -ARM_FUNC void SNDi_SetPlayerParam(s32 player, u32 offset, u32 data, s32 size) { +void SNDi_SetPlayerParam(s32 player, u32 offset, u32 data, s32 size) { PushCmd4(SND_CMD_PLAYER_PARAM, player, offset, data, size); } -ARM_FUNC void SNDi_SetTrackParam(s32 player, u32 trackBitMask, u32 offset, u32 data, s32 size) { +void SNDi_SetTrackParam(s32 player, u32 trackBitMask, u32 offset, u32 data, s32 size) { PushCmd4(SND_CMD_TRACK_PARAM, player | (size << 24), trackBitMask, offset, data); } -// ARM_FUNC void SNDi_SetSurroundDecay(s32 decay) { } +// void SNDi_SetSurroundDecay(s32 decay) { } -// ARM_FUNC void SNDi_SkipSeq(s32 player, u32 tick) { } +// void SNDi_SkipSeq(s32 player, u32 tick) { } -ARM_FUNC static void PushCommand_impl(s32 id, u32 par1, u32 par2, u32 par3, u32 par4) { +static void PushCommand_impl(s32 id, u32 par1, u32 par2, u32 par3, u32 par4) { struct SNDCommand *cmd = SND_AllocCommand(SND_CMD_FLAG_BLOCK); if (cmd == NULL) return; diff --git a/arm9/lib/NitroSDK/src/SND_main.c b/arm9/lib/NitroSDK/src/SND_main.c index f97b0873b..f575009bb 100644 --- a/arm9/lib/NitroSDK/src/SND_main.c +++ b/arm9/lib/NitroSDK/src/SND_main.c @@ -2,13 +2,14 @@ #include "SND_command.h" #include "SND_alarm.h" -#include "global.h" +#include "nitro/types.h" #include "OS_mutex.h" +#include "code32.h" static struct OSMutex sSndMutex; static s32 sSndInitialized; -ARM_FUNC void SND_Init(void) { +void SND_Init(void) { if (sSndInitialized) return; sSndInitialized = 1; @@ -17,10 +18,10 @@ ARM_FUNC void SND_Init(void) { SND_AlarmInit(); } -ARM_FUNC void SNDi_LockMutex(void) { +void SNDi_LockMutex(void) { OS_LockMutex(&sSndMutex); } -ARM_FUNC void SNDi_UnlockMutex(void) { +void SNDi_UnlockMutex(void) { OS_UnlockMutex(&sSndMutex); } diff --git a/arm9/lib/NitroSDK/src/SND_util.c b/arm9/lib/NitroSDK/src/SND_util.c index 6ff8cb14c..397b58b7a 100644 --- a/arm9/lib/NitroSDK/src/SND_util.c +++ b/arm9/lib/NitroSDK/src/SND_util.c @@ -1,4 +1,6 @@ #include "SND_util.h" +#include "nitro/types.h" +#include "code32.h" // not used in pokediamond //static const u16 sPitchTable[0x600] = { @@ -209,7 +211,7 @@ const s16 SNDi_DecibelTable[0x80] = { // -10, -8, -7, -6, -4, -3, -1, 0, //}; -ARM_FUNC u16 SND_CalcChannelVolume(s32 x) { +u16 SND_CalcChannelVolume(s32 x) { // directly using s32 doesn't match int decibels = (int)x; if (decibels < -723) diff --git a/arm9/lib/NitroSDK/src/SND_work.c b/arm9/lib/NitroSDK/src/SND_work.c index ca9208d6c..bd3b11f33 100644 --- a/arm9/lib/NitroSDK/src/SND_work.c +++ b/arm9/lib/NitroSDK/src/SND_work.c @@ -2,6 +2,8 @@ #include "SND_alarm.h" #include "SND_main.h" #include "OS_cache.h" +#include "nitro/types.h" +#include "code32.h" struct SNDSharedWork *SNDi_SharedWork; @@ -87,12 +89,12 @@ u32 SND_GetPlayerTickCounter(u32 playerId) { // return TRUE; //} -ARM_FUNC u32 SNDi_GetFinishedCommandTag(void) { +u32 SNDi_GetFinishedCommandTag(void) { DC_InvalidateRange(&SNDi_SharedWork->finishedCommandTag, 4); return SNDi_SharedWork->finishedCommandTag; } -ARM_FUNC void SNDi_InitSharedWork(struct SNDSharedWork *sw) { +void SNDi_InitSharedWork(struct SNDSharedWork *sw) { sw->playerStatus = 0; sw->channelStatus = 0; sw->captureStatus = 0; diff --git a/arm9/lib/NitroSDK/src/WIFI_stubsmd5_dummy.c b/arm9/lib/NitroSDK/src/WIFI_stubsmd5_dummy.c new file mode 100644 index 000000000..07e27d4fd --- /dev/null +++ b/arm9/lib/NitroSDK/src/WIFI_stubsmd5_dummy.c @@ -0,0 +1,17 @@ +#include "WIFI_stubsmd5_dummy.h" +#include "code32.h" + +void MD5Init(struct DGTHash1Context *context) +{ + DGT_Hash1Reset(context); +} + +void MD5Update(struct DGTHash1Context *context, u8 *input, u32 length) +{ + DGT_Hash1SetSource(context, input, length); +} + +void MD5Final(u8 *digest, struct DGTHash1Context *context) +{ + DGT_Hash1GetDigest_R(digest, context); +} diff --git a/arm9/lib/NitroSDK/src/WM_ks.c b/arm9/lib/NitroSDK/src/WM_ks.c index 93e96f89a..392b770d5 100644 --- a/arm9/lib/NitroSDK/src/WM_ks.c +++ b/arm9/lib/NitroSDK/src/WM_ks.c @@ -1,15 +1,15 @@ #include "WM_ks.h" -#include "function_target.h" +#include "code32.h" extern WMErrCode WM_StartDataSharing(WMKeySetBuf *buf, u16 port, u16 aidBitmap, u16 dataLength, BOOL doubleMode); extern WMErrCode WM_EndDataSharing(WMKeySetBuf *buf); -ARM_FUNC WMErrCode WM_StartKeySharing(WMKeySetBuf *buf, u16 port) +WMErrCode WM_StartKeySharing(WMKeySetBuf *buf, u16 port) { return WM_StartDataSharing(buf, port, 0xffff, 2, TRUE); } -ARM_FUNC WMErrCode WM_EndKeySharing(WMKeySetBuf *buf) +WMErrCode WM_EndKeySharing(WMKeySetBuf *buf) { return WM_EndDataSharing(buf); } diff --git a/arm9/lib/NitroSDK/src/crt0.c b/arm9/lib/NitroSDK/src/crt0.c index 4e46cb630..ebcf25435 100644 --- a/arm9/lib/NitroSDK/src/crt0.c +++ b/arm9/lib/NitroSDK/src/crt0.c @@ -1,5 +1,6 @@ #include "nitro.h" #include "MI_uncompress.h" +#include "code32.h" extern void NitroMain(void); extern void SDK_IRQ_STACKSIZE(void); @@ -26,7 +27,7 @@ void _start(void); #define SDK_NITROCODE_LE 0x2106c0de #define SDK_NITROCODE_BE 0xdec00621 -ARM_FUNC asm void _start(void) +asm void _start(void) { //set IME to 0 mov r12, #0x4000000 @@ -136,7 +137,7 @@ _020008C4: bx r1 } -ARM_FUNC static asm void INITi_CpuClear32(register u32 data, register void *destp, register u32 size) +static asm void INITi_CpuClear32(register u32 data, register void *destp, register u32 size) { add r12, r1, r2 _02000940: @@ -158,7 +159,7 @@ void *const _start_ModuleParams[] = { (void *)SDK_NITROCODE_LE, // Checker 2 }; -ARM_FUNC asm void MIi_UncompressBackward(register void *bottom) +asm void MIi_UncompressBackward(register void *bottom) { cmp r0, #0 beq _020009F8 @@ -215,7 +216,7 @@ _020009F8: bx lr } -ARM_FUNC static asm void do_autoload(void) +static asm void do_autoload(void) { ldr r0, =_start_ModuleParams ldr r1, [r0, #0] @@ -260,7 +261,7 @@ _02000A6C: b _start_AutoloadDoneCallback } -ARM_FUNC asm void _start_AutoloadDoneCallback(void *argv[]) +asm void _start_AutoloadDoneCallback(void *argv[]) { bx lr } @@ -269,7 +270,7 @@ ARM_FUNC asm void _start_AutoloadDoneCallback(void *argv[]) #define SET_PROTECTION_B(id, addr, size) mcr p15, 0, r0, c6, id, 0 #define REGION_BIT(a,b,c,d,e,f,g,h) (((a)<<0)|((b)<<1)|((c)<<2)|((d)<<3)|((e)<<4)|((f)<<5)|((g)<<6)|((h)<<7)) #define REGION_ACC(a,b,c,d,e,f,g,h) (((a)<<0)|((b)<<4)|((c)<<8)|((d)<<12)|((e)<<16)|((f)<<20)|((g)<<24)|((h)<<28)) -ARM_FUNC static asm void init_cp15(void) +static asm void init_cp15(void) { //Disable TCM/Cache/Protection Unit mrc p15, 0, r0, c1, c0, 0 //Save Control Register @@ -368,11 +369,11 @@ ARM_FUNC static asm void init_cp15(void) #undef REGION_BIT #undef REGION_ACC -ARM_FUNC void NitroStartUp(void) +void NitroStartUp(void) { } -ARM_FUNC void OSi_ReferSymbol(void *symbol) +void OSi_ReferSymbol(void *symbol) { #pragma unused(symbol) } diff --git a/arm9/lib/NitroSDK/src/custom_allocator.c b/arm9/lib/NitroSDK/src/custom_allocator.c index 283c35009..c3ac12fec 100644 --- a/arm9/lib/NitroSDK/src/custom_allocator.c +++ b/arm9/lib/NitroSDK/src/custom_allocator.c @@ -1,13 +1,14 @@ #include "custom_allocator.h" -#include "global.h" +#include "nitro/types.h" #include "OS_alloc.h" +#include "code32.h" static FreeFunc sDestructor; static AllocFunc sAllocator; // Custom allocator -ARM_FUNC void* CallCustomAllocator(u32 size) +void* CallCustomAllocator(u32 size) { if (sAllocator != NULL) return sAllocator(size); @@ -16,7 +17,7 @@ ARM_FUNC void* CallCustomAllocator(u32 size) } // Custom destructor -ARM_FUNC void CallCustomDestructor(void * ptr) +void CallCustomDestructor(void * ptr) { if (sDestructor != NULL) sDestructor(ptr); @@ -25,7 +26,7 @@ ARM_FUNC void CallCustomDestructor(void * ptr) } // Custom alloc/free setter -ARM_FUNC void SetCustomAllocatorAndDestructor(AllocFunc allocator, FreeFunc destructor) +void SetCustomAllocatorAndDestructor(AllocFunc allocator, FreeFunc destructor) { sAllocator = allocator; sDestructor = destructor; diff --git a/arm9/lib/libc/src/MSL_Common_arith.c b/arm9/lib/libc/src/MSL_Common_arith.c index d4a2e834d..1938126cb 100644 --- a/arm9/lib/libc/src/MSL_Common_arith.c +++ b/arm9/lib/libc/src/MSL_Common_arith.c @@ -1,7 +1,8 @@ #include "MSL_Common_arith.h" -#include "function_target.h" +#include "nitro/types.h" +#include "code32.h" -ARM_FUNC s32 abs(s32 val) +s32 abs(s32 val) { return val < 0 ? -val : val; } diff --git a/arm9/lib/libc/src/MSL_Common_rand.c b/arm9/lib/libc/src/MSL_Common_rand.c index 849065f0b..76b5b65bd 100644 --- a/arm9/lib/libc/src/MSL_Common_rand.c +++ b/arm9/lib/libc/src/MSL_Common_rand.c @@ -1,15 +1,15 @@ #include "MSL_Common_rand.h" -#include "function_target.h" +#include "code32.h" static u32 random_next = 1; -ARM_FUNC s32 rand(void) +s32 rand(void) { random_next = random_next * 1103515245 + 12345; return ((random_next >> 16) & 0x7fff); } -ARM_FUNC void srand(u32 seed) +void srand(u32 seed) { random_next = seed; } diff --git a/arm9/lib/libnns/src/NNS_FND_allocator.c b/arm9/lib/libnns/src/NNS_FND_allocator.c index bfdaab0f1..4a58fe41d 100644 --- a/arm9/lib/libnns/src/NNS_FND_allocator.c +++ b/arm9/lib/libnns/src/NNS_FND_allocator.c @@ -1,28 +1,29 @@ #include "nitro.h" #include "NNS_FND_allocator.h" #include "NNS_FND_expheap.h" +#include "code32.h" -ARM_FUNC void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size) +void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size) { return NNS_FndAllocFromExpHeapEx(pAllocator->pHeap, size, pAllocator->heapParam1); } -ARM_FUNC void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock) +void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock) { NNS_FndFreeToExpHeap(pAllocator->pHeap, memBlock); } -ARM_FUNC void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size) +void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size) { return pAllocator->pFunc->pfAlloc(pAllocator, size); } -ARM_FUNC void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock) +void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock) { pAllocator->pFunc->pfFree(pAllocator, memBlock); } -ARM_FUNC void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment) +void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment) { static const NNSFndAllocatorFunc pFunc = {AllocatorAllocForExpHeap, AllocatorFreeForExpHeap}; pAllocator->pFunc = &pFunc; diff --git a/arm9/lib/libnns/src/NNS_FND_expheap.c b/arm9/lib/libnns/src/NNS_FND_expheap.c index b3f468aaa..837580d46 100644 --- a/arm9/lib/libnns/src/NNS_FND_expheap.c +++ b/arm9/lib/libnns/src/NNS_FND_expheap.c @@ -1,5 +1,6 @@ -#include "global.h" +#include "nitro/types.h" #include "NNS_FND_expheap.h" +#include "code32.h" static inline u16 GetAlignmentForMBlock(NNSiFndExpHeapMBlockHead* block) { @@ -61,13 +62,13 @@ static inline NNSiFndHeapHead* GetHeapHeadPtrFromExpHeapHead(NNSiFndExpHeapHead* return SubU32ToPtr(pEHHead, sizeof(NNSiFndHeapHead)); } -ARM_FUNC void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block) +void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block) { region->start = SubU32ToPtr(block, GetAlignmentForMBlock(block)); region->end = GetMBlockEndAddr(block); } -ARM_FUNC NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block) +NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block) { NNSiFndExpHeapMBlockHead* const prev = block->pMBHeadPrev; NNSiFndExpHeapMBlockHead* const next = block->pMBHeadNext; @@ -93,7 +94,7 @@ ARM_FUNC NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSi return prev; } -ARM_FUNC NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev) +NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev) { NNSiFndExpHeapMBlockHead* next; target->pMBHeadPrev = prev; @@ -120,7 +121,7 @@ ARM_FUNC NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSi return target; } -ARM_FUNC NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature) +NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature) { NNSiFndExpHeapMBlockHead* block = pRegion->start; block->signature = signature; @@ -136,7 +137,7 @@ static inline NNSiFndExpHeapMBlockHead* InitFreeMBlock(const NNSiMemRegion* regi return InitMBlock(region, 0x4652); } -ARM_FUNC NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag) +NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag) { NNSiFndHeapHead* pHeapHd = (NNSiFndHeapHead*)startAddress; NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd); @@ -165,7 +166,7 @@ static inline void AppendMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlock (void) InsertMBlock(list, block, list->tail); } -ARM_FUNC void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction) +void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction) { NNSiMemRegion freeRgnT; NNSiMemRegion freeRgnB; @@ -213,7 +214,7 @@ ARM_FUNC void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndE return mblock; } -ARM_FUNC void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) +void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) { NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd); const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0; @@ -243,7 +244,7 @@ ARM_FUNC void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 0); } -ARM_FUNC void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) +void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) { NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd); const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0; @@ -273,7 +274,7 @@ ARM_FUNC void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment) return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 1); } -ARM_FUNC BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion) +BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion) { NNSiFndExpHeapMBlockHead* pBlkPtrFree = NULL; NNSiMemRegion freeRgn = *pRegion; @@ -303,7 +304,7 @@ ARM_FUNC BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pR return TRUE; } -ARM_FUNC NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag) +NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag) { void* endAddress = NNSi_FndRoundDownPtr(AddU32ToPtr(startAddress, size), 4); startAddress = NNSi_FndRoundUpPtr(startAddress, 4); @@ -312,12 +313,12 @@ ARM_FUNC NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u return InitExpHeap(startAddress, endAddress, optFlag); } -ARM_FUNC void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle) +void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle) { NNSi_FndFinalizeHeap(handle); } -ARM_FUNC void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment) +void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment) { if (size == 0) size = 1; @@ -329,7 +330,7 @@ ARM_FUNC void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int } /* -ARM_FUNC u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size) +u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size) { NNSiFndExpHeapHead* pEHHead; NNSiFndExpHeapMBlockHead* pMBHead; diff --git a/arm9/lib/libnns/src/NNS_FND_heapcommon.c b/arm9/lib/libnns/src/NNS_FND_heapcommon.c index 5e98470af..41d0a85f5 100644 --- a/arm9/lib/libnns/src/NNS_FND_heapcommon.c +++ b/arm9/lib/libnns/src/NNS_FND_heapcommon.c @@ -1,13 +1,14 @@ #include "nitro.h" #include "NNS_FND_heapcommon.h" #include "NNS_FND_list.h" +#include "code32.h" BOOL sRootListInitialized; NNSFndList sRootList; -ARM_FUNC void *NNS_FndGetNextListObject(NNSFndList *, void *); +void *NNS_FndGetNextListObject(NNSFndList *, void *); -ARM_FUNC static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock) +static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock) { NNSiFndHeapHead * pHead = NULL; @@ -24,7 +25,7 @@ ARM_FUNC static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void return NULL; } -ARM_FUNC static NNSFndList* FindListContainHeap(const void * memBlock) +static NNSFndList* FindListContainHeap(const void * memBlock) { NNSFndList* ret = &sRootList; NNSiFndHeapHead* pHead = FindContainHeap(&sRootList, memBlock); @@ -33,7 +34,7 @@ ARM_FUNC static NNSFndList* FindListContainHeap(const void * memBlock) return ret; } -ARM_FUNC void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag) +void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag) { pHead->signature = signature; pHead->heapStart = heapStart; @@ -49,7 +50,7 @@ ARM_FUNC void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* NNS_FndAppendListObject(FindListContainHeap(pHead), pHead); } -ARM_FUNC void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead) +void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead) { NNS_FndRemoveListObject(FindListContainHeap(pHead), pHead); } diff --git a/arm9/lib/libnns/src/NNS_FND_list.c b/arm9/lib/libnns/src/NNS_FND_list.c index 7334fbaad..30437bf65 100644 --- a/arm9/lib/libnns/src/NNS_FND_list.c +++ b/arm9/lib/libnns/src/NNS_FND_list.c @@ -1,9 +1,10 @@ #include "nitro.h" #include "NNS_FND_list.h" +#include "code32.h" #define OBJ_TO_LINK(list, obj) ((NNSFndLink*)((void*)(obj) + (list)->offset)) -ARM_FUNC void NNS_FndInitList(NNSFndList* list, s32 alignment) +void NNS_FndInitList(NNSFndList* list, s32 alignment) { list->headObject = NULL; list->tailObject = NULL; @@ -11,7 +12,7 @@ ARM_FUNC void NNS_FndInitList(NNSFndList* list, s32 alignment) list->offset = (u16)alignment; } -ARM_FUNC static void SetFirstObject(NNSFndList* list, void* object) +static void SetFirstObject(NNSFndList* list, void* object) { NNSFndLink* tail = OBJ_TO_LINK(list, object); tail->nextObject = NULL; @@ -21,7 +22,7 @@ ARM_FUNC static void SetFirstObject(NNSFndList* list, void* object) list->numObjects++; } -ARM_FUNC void NNS_FndAppendListObject(NNSFndList* list, void* object) +void NNS_FndAppendListObject(NNSFndList* list, void* object) { if (list->headObject == NULL) { @@ -38,7 +39,7 @@ ARM_FUNC void NNS_FndAppendListObject(NNSFndList* list, void* object) } } -ARM_FUNC void NNS_FndPrependListObject(NNSFndList* list, void* object) +void NNS_FndPrependListObject(NNSFndList* list, void* object) { if (list->headObject == NULL) { @@ -55,7 +56,7 @@ ARM_FUNC void NNS_FndPrependListObject(NNSFndList* list, void* object) } } -ARM_FUNC void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object) +void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object) { if (where == NULL) { @@ -79,7 +80,7 @@ ARM_FUNC void NNS_FndInsertListObject(NNSFndList* list, void* where, void* objec } } -ARM_FUNC void NNS_FndRemoveListObject(NNSFndList* list, void* object) +void NNS_FndRemoveListObject(NNSFndList* list, void* object) { NNSFndLink* node = OBJ_TO_LINK(list, object); if (node->prevObject == NULL) @@ -103,7 +104,7 @@ ARM_FUNC void NNS_FndRemoveListObject(NNSFndList* list, void* object) list->numObjects--; } -ARM_FUNC void * NNS_FndGetNextListObject(NNSFndList* list, void* object) +void * NNS_FndGetNextListObject(NNSFndList* list, void* object) { if (object == NULL) { @@ -115,7 +116,7 @@ ARM_FUNC void * NNS_FndGetNextListObject(NNSFndList* list, void* object) } } -ARM_FUNC void * NNS_FndGetPrevListObject(NNSFndList* list, void* object) +void * NNS_FndGetPrevListObject(NNSFndList* list, void* object) { if (object == NULL) { diff --git a/arm9/modules/01/src/module_01.c b/arm9/modules/01/src/module_01.c index a126a2476..86ff69029 100644 --- a/arm9/modules/01/src/module_01.c +++ b/arm9/modules/01/src/module_01.c @@ -1,6 +1,5 @@ #include "global.h" #include "sinit.h" -#pragma thumb on static void NitroStaticInit(void) { static u32 var[2]; diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c index 11cd52758..cc24904eb 100644 --- a/arm9/modules/05/src/mod05_021E72FC.c +++ b/arm9/modules/05/src/mod05_021E72FC.c @@ -20,7 +20,7 @@ extern void FUN_02055304(u32 param0, u32 param1); extern BOOL FUN_02056B74(u32 param0, u32 param1, u32 param2); extern void FUN_02058418(u32 param0, u32 param1); -THUMB_FUNC BOOL MOD05_021E72FC(u32 param0, u32 param1) +BOOL MOD05_021E72FC(u32 param0, u32 param1) { u8 res = (u8)FUN_02058720(FUN_020553A0(param1)); u32 r2; @@ -50,7 +50,7 @@ label: return TRUE; } -THUMB_FUNC void MOD05_021E7358(u32 param0, u32 param1, u32 param2) +void MOD05_021E7358(u32 param0, u32 param1, u32 param2) { UnkStruct021E7358 *res = MOD05_021E74D4(24); res->Unk0C = param0; @@ -60,7 +60,7 @@ THUMB_FUNC void MOD05_021E7358(u32 param0, u32 param1, u32 param2) FUN_020463CC(param0, MOD05_021E73B4, res); } -THUMB_FUNC u32 MOD05_021E7388(u32 param0) +u32 MOD05_021E7388(u32 param0) { switch (param0) { @@ -76,7 +76,7 @@ THUMB_FUNC u32 MOD05_021E7388(u32 param0) return 0; } -THUMB_FUNC BOOL MOD05_021E73B4(UnkStruct021E7358 *param0) +BOOL MOD05_021E73B4(UnkStruct021E7358 *param0) { UnkStruct021E7358 *strct = FUN_0204652C(param0); u32 res = FUN_020553A0(strct->Unk10); @@ -142,7 +142,7 @@ THUMB_FUNC BOOL MOD05_021E73B4(UnkStruct021E7358 *param0) return FALSE; } -THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0) +UnkStruct021E7358 *MOD05_021E74D4(u32 param0) { UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(4, param0); if (res == NULL) @@ -153,7 +153,7 @@ THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0) return res; } -THUMB_FUNC void MOD05_021E74F8(UnkStruct021E7358 *param0) +void MOD05_021E74F8(UnkStruct021E7358 *param0) { FreeToHeapExplicit(4, param0); } diff --git a/arm9/modules/11/src/mod11_0222D5C0_2.c b/arm9/modules/11/src/mod11_0222D5C0_2.c index 8bf5f6f6e..2dc735da6 100644 --- a/arm9/modules/11/src/mod11_0222D5C0_2.c +++ b/arm9/modules/11/src/mod11_0222D5C0_2.c @@ -6,7 +6,7 @@ FS_EXTERN_OVERLAY(MODULE_16); -THUMB_FUNC static void MOD11_0222F284(void) +static void MOD11_0222F284(void) { if (!FUN_02033590()) { diff --git a/arm9/modules/19/src/module_19.c b/arm9/modules/19/src/module_19.c index 036efea93..a5b509809 100644 --- a/arm9/modules/19/src/module_19.c +++ b/arm9/modules/19/src/module_19.c @@ -20,7 +20,7 @@ const struct BgTemplate MOD19_02252508 = { .mosaic = 0 }; -THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig) +void MOD19_02252440(struct BgConfig * bgConfig) { CreateHeap(3, 8, 0x18000); GXS_SetGraphicsMode(GX_BGMODE_0); @@ -35,13 +35,13 @@ THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig) GXS_SetVisiblePlane(GX_PLANEMASK_BG0); } -THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig) +void MOD19_022524F4(struct BgConfig * bgConfig) { FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0); DestroyHeap(8); } -THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig) +BOOL MOD19_02252504(struct BgConfig * bgConfig) { #pragma unused(bgConfig) return TRUE; diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c index 2b7e36eca..a634abd60 100644 --- a/arm9/modules/21/src/mod21_02254854.c +++ b/arm9/modules/21/src/mod21_02254854.c @@ -16,7 +16,7 @@ extern void MOD20_0225298C(u32 param0); extern void Poketch_InitApp(void *func1, void *func2); -THUMB_FUNC static void MOD21_02254840(void) +static void MOD21_02254840(void) { Poketch_InitApp(MOD21_02254854, MOD21_0225496C); } @@ -24,7 +24,7 @@ THUMB_FUNC static void MOD21_02254840(void) #define NitroStaticInit MOD21_02254840 #include "sinit.h" -THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3) +BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3) { UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854)); if (alloced != NULL) @@ -39,7 +39,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param return FALSE; } -THUMB_FUNC BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3) +BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3) { #pragma unused (param2, param3) //not sure, please check if (MOD21_02254A6C((UnkStruct02254A6C *)¶m0->Unk24, ¶m0->time)) //todo fix @@ -73,14 +73,14 @@ THUMB_FUNC BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2 BOOL (* const MOD21_02254D84[])(UnkStruct02254854 *) = { MOD21_022549A4, MOD21_022549E4, MOD21_02254A38 }; -THUMB_FUNC void MOD21_02254918(UnkStruct02254854 *param0) +void MOD21_02254918(UnkStruct02254854 *param0) { MOD21_02254B04(param0->Unk24); MOD20_02254198(param0->Unk10); FreeToHeap((void *)param0); } -THUMB_FUNC void MOD21_02254930(u32 param0, UnkStruct02254854 *param1) +void MOD21_02254930(u32 param0, UnkStruct02254854 *param1) { if (param1->bytearray[0] >= 3) { @@ -96,12 +96,12 @@ THUMB_FUNC void MOD21_02254930(u32 param0, UnkStruct02254854 *param1) MOD20_022529A0(param1->Unk28); } -THUMB_FUNC void MOD21_0225496C(UnkStruct02254854 *param0) +void MOD21_0225496C(UnkStruct02254854 *param0) { param0->bytearray[2] = 1; } -THUMB_FUNC void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3) +void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3) { #pragma unused (param0, param1) switch (param2) @@ -119,7 +119,7 @@ THUMB_FUNC void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct0225 } } -THUMB_FUNC void MOD21_02254990(UnkStruct02254854 * param0, u8 param1) +void MOD21_02254990(UnkStruct02254854 * param0, u8 param1) { if (param0->bytearray[2] == 0) { @@ -132,7 +132,7 @@ THUMB_FUNC void MOD21_02254990(UnkStruct02254854 * param0, u8 param1) param0->bytearray[1] = 0; } -THUMB_FUNC BOOL MOD21_022549A4(UnkStruct02254854 * param0) +BOOL MOD21_022549A4(UnkStruct02254854 * param0) { switch (param0->bytearray[1]) { @@ -154,7 +154,7 @@ THUMB_FUNC BOOL MOD21_022549A4(UnkStruct02254854 * param0) return FALSE; } -THUMB_FUNC BOOL MOD21_022549E4(UnkStruct02254854 * param0) +BOOL MOD21_022549E4(UnkStruct02254854 * param0) { if (param0->bytearray[2]) { @@ -178,7 +178,7 @@ THUMB_FUNC BOOL MOD21_022549E4(UnkStruct02254854 * param0) return FALSE; } -THUMB_FUNC BOOL MOD21_02254A38(UnkStruct02254854 * param0) +BOOL MOD21_02254A38(UnkStruct02254854 * param0) { switch (param0->bytearray[1]) { diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index 681186f22..6254955d9 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -38,7 +38,7 @@ extern void CopyToBgTilemapRect(u32 param0, u32 param1, u32 param2, u32 param3, extern void MOD11_02252DB4(u32 param0, u32 param1); -THUMB_FUNC BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) +BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) { UnkStruct02254A6C *strct = (UnkStruct02254A6C *)AllocFromHeap(8, 3 << 8); u32 sp4; @@ -61,7 +61,7 @@ THUMB_FUNC BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) return FALSE; } -THUMB_FUNC void MOD21_02254AD4(void *param0, void *param1) +void MOD21_02254AD4(void *param0, void *param1) { s32 i = 0; for (u32 r6 = 9 << 6; i < 9; r6 -= 0x30) @@ -74,7 +74,7 @@ THUMB_FUNC void MOD21_02254AD4(void *param0, void *param1) } } -THUMB_FUNC void MOD21_02254B04(void *param0) +void MOD21_02254B04(void *param0) { if (param0 != NULL) { @@ -82,27 +82,27 @@ THUMB_FUNC void MOD21_02254B04(void *param0) } } -THUMB_FUNC void MOD21_02254B10(u32 *param0, u32 param1) +void MOD21_02254B10(u32 *param0, u32 param1) { MOD20_022537E0(MOD21_02254DAC, param1, param0, *param0, (void *)(param0 + 2), 2, 8); } -THUMB_FUNC BOOL MOD21_02254B34(void *param0, u32 param1) +BOOL MOD21_02254B34(void *param0, u32 param1) { return MOD20_02253794((void *)((u32)param0 + 8), param1); } -THUMB_FUNC BOOL MOD21_02254B40(void *param0) +BOOL MOD21_02254B40(void *param0) { return MOD20_022537B8((void *)((u32)param0 + 8)); } -THUMB_FUNC BOOL MOD21_02254B4C(void *param0) +BOOL MOD21_02254B4C(void *param0) { return MOD20_02253888((void *)((u32)MOD20_022538A0(param0) + 8), param0); } -THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1) +BOOL MOD21_02254B60(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); @@ -125,7 +125,7 @@ THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1) return MOD21_02254B4C(param1); } -THUMB_FUNC BOOL MOD21_02254BF4(u32 param0, void *param1) +BOOL MOD21_02254BF4(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); @@ -134,7 +134,7 @@ THUMB_FUNC BOOL MOD21_02254BF4(u32 param0, void *param1) return MOD21_02254B4C(param1); } -THUMB_FUNC BOOL MOD21_02254C14(u32 param0, void *param1) +BOOL MOD21_02254C14(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); @@ -149,7 +149,7 @@ THUMB_FUNC BOOL MOD21_02254C14(u32 param0, void *param1) return MOD21_02254B4C(param1); } -THUMB_FUNC BOOL MOD21_02254C40(u32 param0, void *param1) +BOOL MOD21_02254C40(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); @@ -157,7 +157,7 @@ THUMB_FUNC BOOL MOD21_02254C40(u32 param0, void *param1) return MOD21_02254B4C(param1); } -THUMB_FUNC void MOD21_02254C5C(UnkStruct02254A6C *param0) +void MOD21_02254C5C(UnkStruct02254A6C *param0) { u32 tmp = (u32)param0->Unk00->Unk00; reg_CP_DIVCNT = 0; diff --git a/arm9/modules/22/src/module_22_sinit.c b/arm9/modules/22/src/module_22_sinit.c index 0095f0c1f..88774e602 100644 --- a/arm9/modules/22/src/module_22_sinit.c +++ b/arm9/modules/22/src/module_22_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD22_02254854(); extern void MOD22_022549D8(); -THUMB_FUNC static void MOD22_02254840(void) +static void MOD22_02254840(void) { Poketch_InitApp(MOD22_02254854, MOD22_022549D8); } diff --git a/arm9/modules/23/src/module_23_sinit.c b/arm9/modules/23/src/module_23_sinit.c index 97abb0127..f181471ae 100644 --- a/arm9/modules/23/src/module_23_sinit.c +++ b/arm9/modules/23/src/module_23_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD23_02254854(); extern void MOD23_022549A4(); -THUMB_FUNC static void MOD23_02254840(void) +static void MOD23_02254840(void) { Poketch_InitApp(MOD23_02254854, MOD23_022549A4); } diff --git a/arm9/modules/24/src/module_24_sinit.c b/arm9/modules/24/src/module_24_sinit.c index de535e776..fbec7f83b 100644 --- a/arm9/modules/24/src/module_24_sinit.c +++ b/arm9/modules/24/src/module_24_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD24_02254854(); extern void MOD24_02254990(); -THUMB_FUNC static void MOD24_02254840(void) +static void MOD24_02254840(void) { Poketch_InitApp(MOD24_02254854, MOD24_02254990); } diff --git a/arm9/modules/25/src/module_25_sinit.c b/arm9/modules/25/src/module_25_sinit.c index e86493c74..c2be01d65 100644 --- a/arm9/modules/25/src/module_25_sinit.c +++ b/arm9/modules/25/src/module_25_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD25_02254854(); extern void MOD25_0225496C(); -THUMB_FUNC static void MOD25_02254840(void) +static void MOD25_02254840(void) { Poketch_InitApp(MOD25_02254854, MOD25_0225496C); } diff --git a/arm9/modules/26/src/module_26_sinit.c b/arm9/modules/26/src/module_26_sinit.c index a84f88bb6..9b2091817 100644 --- a/arm9/modules/26/src/module_26_sinit.c +++ b/arm9/modules/26/src/module_26_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD26_02254854(); extern void MOD26_02254A84(); -THUMB_FUNC static void MOD26_02254840(void) +static void MOD26_02254840(void) { Poketch_InitApp(MOD26_02254854, MOD26_02254A84); } diff --git a/arm9/modules/27/src/module_27_sinit.c b/arm9/modules/27/src/module_27_sinit.c index cb942ec9a..af0a06217 100644 --- a/arm9/modules/27/src/module_27_sinit.c +++ b/arm9/modules/27/src/module_27_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD27_02254854(); extern void MOD27_0225492C(); -THUMB_FUNC static void MOD27_02254840(void) +static void MOD27_02254840(void) { Poketch_InitApp(MOD27_02254854, MOD27_0225492C); } diff --git a/arm9/modules/28/src/module_28_sinit.c b/arm9/modules/28/src/module_28_sinit.c index 605cc4ece..ad39bddb6 100644 --- a/arm9/modules/28/src/module_28_sinit.c +++ b/arm9/modules/28/src/module_28_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD28_02254854(); extern void MOD28_022549F4(); -THUMB_FUNC static void MOD28_02254840(void) +static void MOD28_02254840(void) { Poketch_InitApp(MOD28_02254854, MOD28_022549F4); } diff --git a/arm9/modules/29/src/module_29_sinit.c b/arm9/modules/29/src/module_29_sinit.c index 34914f4b7..c78371060 100644 --- a/arm9/modules/29/src/module_29_sinit.c +++ b/arm9/modules/29/src/module_29_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD29_02254854(); extern void MOD29_02254914(); -THUMB_FUNC static void MOD29_02254840(void) +static void MOD29_02254840(void) { Poketch_InitApp(MOD29_02254854, MOD29_02254914); } diff --git a/arm9/modules/30/src/module_30_sinit.c b/arm9/modules/30/src/module_30_sinit.c index cdf50ca2a..44d6f52c1 100644 --- a/arm9/modules/30/src/module_30_sinit.c +++ b/arm9/modules/30/src/module_30_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD30_02254854(); extern void MOD30_0225496C(); -THUMB_FUNC static void MOD30_02254840(void) +static void MOD30_02254840(void) { Poketch_InitApp(MOD30_02254854, MOD30_0225496C); } diff --git a/arm9/modules/31/src/module_31_sinit.c b/arm9/modules/31/src/module_31_sinit.c index 89eadae80..50cc204c8 100644 --- a/arm9/modules/31/src/module_31_sinit.c +++ b/arm9/modules/31/src/module_31_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD31_02254854(); extern void MOD31_02254954(); -THUMB_FUNC static void MOD31_02254840(void) +static void MOD31_02254840(void) { Poketch_InitApp(MOD31_02254854, MOD31_02254954); } diff --git a/arm9/modules/32/src/module_32_sinit.c b/arm9/modules/32/src/module_32_sinit.c index f62d14b63..445462ff1 100644 --- a/arm9/modules/32/src/module_32_sinit.c +++ b/arm9/modules/32/src/module_32_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD32_02254854(); extern void MOD32_0225495C(); -THUMB_FUNC static void MOD32_02254840(void) +static void MOD32_02254840(void) { Poketch_InitApp(MOD32_02254854, MOD32_0225495C); } diff --git a/arm9/modules/33/src/module_33_sinit.c b/arm9/modules/33/src/module_33_sinit.c index 6ea456ad2..963b1fde7 100644 --- a/arm9/modules/33/src/module_33_sinit.c +++ b/arm9/modules/33/src/module_33_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD33_02254854(); extern void MOD33_02254908(); -THUMB_FUNC static void MOD33_02254840(void) +static void MOD33_02254840(void) { Poketch_InitApp(MOD33_02254854, MOD33_02254908); } diff --git a/arm9/modules/34/src/module_34_sinit.c b/arm9/modules/34/src/module_34_sinit.c index 96789176d..037fa6ea8 100644 --- a/arm9/modules/34/src/module_34_sinit.c +++ b/arm9/modules/34/src/module_34_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD34_02254854(); extern void MOD34_02254948(); -THUMB_FUNC static void MOD34_02254840(void) +static void MOD34_02254840(void) { Poketch_InitApp(MOD34_02254854, MOD34_02254948); } diff --git a/arm9/modules/35/src/module_35_sinit.c b/arm9/modules/35/src/module_35_sinit.c index 85fe53440..03712000e 100644 --- a/arm9/modules/35/src/module_35_sinit.c +++ b/arm9/modules/35/src/module_35_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD35_02254854(); extern void MOD35_02254924(); -THUMB_FUNC static void MOD35_02254840(void) +static void MOD35_02254840(void) { Poketch_InitApp(MOD35_02254854, MOD35_02254924); } diff --git a/arm9/modules/36/src/module_36_sinit.c b/arm9/modules/36/src/module_36_sinit.c index 9db2e3278..ef9df83e4 100644 --- a/arm9/modules/36/src/module_36_sinit.c +++ b/arm9/modules/36/src/module_36_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD36_02254854(); extern void MOD36_02254990(); -THUMB_FUNC static void MOD36_02254840(void) +static void MOD36_02254840(void) { Poketch_InitApp(MOD36_02254854, MOD36_02254990); } diff --git a/arm9/modules/37/src/module_37_sinit.c b/arm9/modules/37/src/module_37_sinit.c index ba3df4235..d0a6e450a 100644 --- a/arm9/modules/37/src/module_37_sinit.c +++ b/arm9/modules/37/src/module_37_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD37_02254854(); extern void MOD37_02254934(); -THUMB_FUNC static void MOD37_02254840(void) +static void MOD37_02254840(void) { Poketch_InitApp(MOD37_02254854, MOD37_02254934); } diff --git a/arm9/modules/38/src/module_38_sinit.c b/arm9/modules/38/src/module_38_sinit.c index 6c41dda83..0dedd0a9a 100644 --- a/arm9/modules/38/src/module_38_sinit.c +++ b/arm9/modules/38/src/module_38_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD38_02254854(); extern void MOD38_02254990(); -THUMB_FUNC static void MOD38_02254840(void) +static void MOD38_02254840(void) { Poketch_InitApp(MOD38_02254854, MOD38_02254990); } diff --git a/arm9/modules/39/src/module_39_sinit.c b/arm9/modules/39/src/module_39_sinit.c index 39e6447f6..3fdaae33b 100644 --- a/arm9/modules/39/src/module_39_sinit.c +++ b/arm9/modules/39/src/module_39_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD39_02254854(); extern void MOD39_022549D4(); -THUMB_FUNC static void MOD39_02254840(void) +static void MOD39_02254840(void) { Poketch_InitApp(MOD39_02254854, MOD39_022549D4); } diff --git a/arm9/modules/40/src/module_40_sinit.c b/arm9/modules/40/src/module_40_sinit.c index fc2d56c56..31baf50e1 100644 --- a/arm9/modules/40/src/module_40_sinit.c +++ b/arm9/modules/40/src/module_40_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD40_02254854(); extern void MOD40_022549D4(); -THUMB_FUNC static void MOD40_02254840(void) +static void MOD40_02254840(void) { Poketch_InitApp(MOD40_02254854, MOD40_022549D4); } diff --git a/arm9/modules/41/src/module_41_sinit.c b/arm9/modules/41/src/module_41_sinit.c index 1e119d0f7..b838b7ffb 100644 --- a/arm9/modules/41/src/module_41_sinit.c +++ b/arm9/modules/41/src/module_41_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD41_02254854(); extern void MOD41_02254AD8(); -THUMB_FUNC static void MOD41_02254840(void) +static void MOD41_02254840(void) { Poketch_InitApp(MOD41_02254854, MOD41_02254AD8); } diff --git a/arm9/modules/42/src/module_42_sinit.c b/arm9/modules/42/src/module_42_sinit.c index 73baf05ba..d6f0338d7 100644 --- a/arm9/modules/42/src/module_42_sinit.c +++ b/arm9/modules/42/src/module_42_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD42_02254854(); extern void MOD42_02254A38(); -THUMB_FUNC static void MOD42_02254840(void) +static void MOD42_02254840(void) { Poketch_InitApp(MOD42_02254854, MOD42_02254A38); } diff --git a/arm9/modules/43/src/module_43_sinit.c b/arm9/modules/43/src/module_43_sinit.c index a3ac14b8e..4aef92a0c 100644 --- a/arm9/modules/43/src/module_43_sinit.c +++ b/arm9/modules/43/src/module_43_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD43_02254854(); extern void MOD43_02254970(); -THUMB_FUNC static void MOD43_02254840(void) +static void MOD43_02254840(void) { Poketch_InitApp(MOD43_02254854, MOD43_02254970); } diff --git a/arm9/modules/44/src/module_44_sinit.c b/arm9/modules/44/src/module_44_sinit.c index 296258722..823209548 100644 --- a/arm9/modules/44/src/module_44_sinit.c +++ b/arm9/modules/44/src/module_44_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD44_02254854(); extern void MOD44_02254920(); -THUMB_FUNC static void MOD44_02254840(void) +static void MOD44_02254840(void) { Poketch_InitApp(MOD44_02254854, MOD44_02254920); } diff --git a/arm9/modules/45/src/module_45_sinit.c b/arm9/modules/45/src/module_45_sinit.c index 6bfb10f77..a65a964a0 100644 --- a/arm9/modules/45/src/module_45_sinit.c +++ b/arm9/modules/45/src/module_45_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD45_02254854(); extern void MOD45_02254A30(); -THUMB_FUNC static void MOD45_02254840(void) +static void MOD45_02254840(void) { Poketch_InitApp(MOD45_02254854, MOD45_02254A30); } diff --git a/arm9/modules/46/src/module_46_sinit.c b/arm9/modules/46/src/module_46_sinit.c index 96fe680a9..72d63c233 100644 --- a/arm9/modules/46/src/module_46_sinit.c +++ b/arm9/modules/46/src/module_46_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD46_02254854(); extern void MOD46_02254908(); -THUMB_FUNC static void MOD46_02254840(void) +static void MOD46_02254840(void) { Poketch_InitApp(MOD46_02254854, MOD46_02254908); } diff --git a/arm9/modules/47/src/module_47_sinit.c b/arm9/modules/47/src/module_47_sinit.c index f255cafab..0e621d7f6 100644 --- a/arm9/modules/47/src/module_47_sinit.c +++ b/arm9/modules/47/src/module_47_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD47_02254854(); extern void MOD47_0225491C(); -THUMB_FUNC static void MOD47_02254840(void) +static void MOD47_02254840(void) { Poketch_InitApp(MOD47_02254854, MOD47_0225491C); } diff --git a/arm9/modules/48/src/module_48_sinit.c b/arm9/modules/48/src/module_48_sinit.c index 6d2a342d2..ec0c0ca70 100644 --- a/arm9/modules/48/src/module_48_sinit.c +++ b/arm9/modules/48/src/module_48_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD48_02254854(); extern void MOD48_0225498C(); -THUMB_FUNC static void MOD48_02254840(void) +static void MOD48_02254840(void) { Poketch_InitApp(MOD48_02254854, MOD48_0225498C); } diff --git a/arm9/modules/49/src/module_49_sinit.c b/arm9/modules/49/src/module_49_sinit.c index 23e5419d9..c6170d094 100644 --- a/arm9/modules/49/src/module_49_sinit.c +++ b/arm9/modules/49/src/module_49_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD49_02254854(); extern void MOD49_02254974(); -THUMB_FUNC static void MOD49_02254840(void) +static void MOD49_02254840(void) { Poketch_InitApp(MOD49_02254854, MOD49_02254974); } diff --git a/arm9/modules/50/src/module_50_sinit.c b/arm9/modules/50/src/module_50_sinit.c index c16e885fd..019058302 100644 --- a/arm9/modules/50/src/module_50_sinit.c +++ b/arm9/modules/50/src/module_50_sinit.c @@ -4,7 +4,7 @@ extern void Poketch_InitApp(void *func1, void *func2); extern void MOD50_02254854(); extern void MOD50_02254908(); -THUMB_FUNC static void MOD50_02254840(void) +static void MOD50_02254840(void) { Poketch_InitApp(MOD50_02254854, MOD50_02254908); } diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c index 65aae93f2..7380db3a8 100644 --- a/arm9/modules/52/src/module_52.c +++ b/arm9/modules/52/src/module_52.c @@ -1,3 +1,4 @@ +#include "global.h" #include "module_52.h" #include "heap.h" #include "unk_0205FA2C.h" @@ -155,7 +156,7 @@ const u16 MOD52_021D76F8[] = { ITEM_GREPA_BERRY, 1, }; -THUMB_FUNC BOOL MOD52_021D74E0(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D74E0(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -165,7 +166,7 @@ THUMB_FUNC BOOL MOD52_021D74E0(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D74F8(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D74F8(struct OverlayManager *manager, u32 *status) { #pragma unused(status) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(manager)[2]; // weird @@ -175,7 +176,7 @@ THUMB_FUNC BOOL MOD52_021D74F8(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D750C(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D750C(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -185,7 +186,7 @@ THUMB_FUNC BOOL MOD52_021D750C(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D7528(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D7528(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -195,7 +196,7 @@ THUMB_FUNC BOOL MOD52_021D7528(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D7540(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D7540(struct OverlayManager *manager, u32 *status) { #pragma unused(status) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(manager)[2]; // weird @@ -207,7 +208,7 @@ THUMB_FUNC BOOL MOD52_021D7540(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D7560(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D7560(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -217,7 +218,7 @@ THUMB_FUNC BOOL MOD52_021D7560(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D757C(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D757C(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -227,7 +228,7 @@ THUMB_FUNC BOOL MOD52_021D757C(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D7594(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D7594(struct OverlayManager *manager, u32 *status) { #pragma unused(status) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(manager)[2]; // weird @@ -248,7 +249,7 @@ THUMB_FUNC BOOL MOD52_021D7594(struct OverlayManager *manager, u32 *status) return TRUE; } -THUMB_FUNC BOOL MOD52_021D75E8(struct OverlayManager *manager, u32 *status) +BOOL MOD52_021D75E8(struct OverlayManager *manager, u32 *status) { #pragma unused(manager) #pragma unused(status) @@ -258,7 +259,7 @@ THUMB_FUNC BOOL MOD52_021D75E8(struct OverlayManager *manager, u32 *status) return 1; } -THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid) +void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid) { Save_SysInfo_InitFromSystem(Save_SysInfo_Get(sav2)); Save_SysInfo_RTC_Init(Save_SysInfo_RTC_Get(sav2)); @@ -284,7 +285,7 @@ THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_tr FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, NELEMS(MOD52_021D76F8) / 2); } -THUMB_FUNC void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2) +void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2) { #pragma unused(unused) @@ -296,7 +297,7 @@ THUMB_FUNC void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2) OS_ResetSystem(0); } -THUMB_FUNC void MOD52_021D769C(u32 unused, struct SaveBlock2 *sav2) +void MOD52_021D769C(u32 unused, struct SaveBlock2 *sav2) { #pragma unused(unused) diff --git a/arm9/modules/59/src/mod59_Intro.c b/arm9/modules/59/src/mod59_Intro.c index 942b3938c..53b697644 100644 --- a/arm9/modules/59/src/mod59_Intro.c +++ b/arm9/modules/59/src/mod59_Intro.c @@ -385,7 +385,7 @@ extern void FUN_020146C4(u32 param0); FS_EXTERN_OVERLAY(MODULE_52); -THUMB_FUNC BOOL MOD59_IntroInit(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_IntroInit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) CreateHeap(3, 0x52, 1 << 18); @@ -408,7 +408,7 @@ THUMB_FUNC BOOL MOD59_IntroInit(struct OverlayManager *overlayManager, u32 *stat return TRUE; } -THUMB_FUNC BOOL MOD59_IntroMain(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_IntroMain(struct OverlayManager *overlayManager, u32 *status) { MOD59_IntroOverlayData *data = (MOD59_IntroOverlayData *) OverlayManager_GetData(overlayManager); BOOL ret = FALSE; @@ -512,7 +512,7 @@ THUMB_FUNC BOOL MOD59_IntroMain(struct OverlayManager *overlayManager, u32 *stat return ret; } -THUMB_FUNC BOOL MOD59_IntroExit(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_IntroExit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) MOD59_IntroOverlayData *data = (MOD59_IntroOverlayData *) OverlayManager_GetData(overlayManager); @@ -534,12 +534,12 @@ THUMB_FUNC BOOL MOD59_IntroExit(struct OverlayManager *overlayManager, u32 *stat return TRUE; } -THUMB_FUNC void MOD59_IntroDoGpuBgUpdate(MOD59_IntroOverlayData *data) +void MOD59_IntroDoGpuBgUpdate(MOD59_IntroOverlayData *data) { DoScheduledBgGpuUpdates(data->bgConfig); } -THUMB_FUNC BOOL MOD59_TestPokeballTouchLocation(void) +BOOL MOD59_TestPokeballTouchLocation(void) { BOOL ret = FALSE; @@ -560,7 +560,7 @@ THUMB_FUNC BOOL MOD59_TestPokeballTouchLocation(void) return ret; } -THUMB_FUNC void MOD59_IntroSetupBg(MOD59_IntroOverlayData *data) +void MOD59_IntroSetupBg(MOD59_IntroOverlayData *data) { struct GraphicsBanks graphicsBanks = MOD59_021D9F18; GX_SetBanks(&graphicsBanks); @@ -630,7 +630,7 @@ THUMB_FUNC void MOD59_IntroSetupBg(MOD59_IntroOverlayData *data) data->fadeCounter = 0; } -THUMB_FUNC void MOD59_IntroDestroyBg(MOD59_IntroOverlayData *data) +void MOD59_IntroDestroyBg(MOD59_IntroOverlayData *data) { ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_OFF); ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_OFF); @@ -655,7 +655,7 @@ THUMB_FUNC void MOD59_IntroDestroyBg(MOD59_IntroOverlayData *data) FreeToHeap(data->bgConfig); } -THUMB_FUNC void MOD59_IntroSetupMsg(MOD59_IntroOverlayData *data) +void MOD59_IntroSetupMsg(MOD59_IntroOverlayData *data) { data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heap_id); @@ -670,24 +670,24 @@ THUMB_FUNC void MOD59_IntroSetupMsg(MOD59_IntroOverlayData *data) data->createListCounter = 0; } -THUMB_FUNC void MOD59_IntroDestroyMsg(MOD59_IntroOverlayData *data) +void MOD59_IntroDestroyMsg(MOD59_IntroOverlayData *data) { MessageFormat_Delete(data->messageFormat); FUN_020143D0(data->unk60); DestroyMsgData(data->msgData); } -THUMB_FUNC void MOD59_021D7A4C(MOD59_IntroOverlayData *data) //MOD59_Setup... something? +void MOD59_021D7A4C(MOD59_IntroOverlayData *data) //MOD59_Setup... something? { data->unk68 = FUN_02014590(data->heap_id); } -THUMB_FUNC void MOD59_021D7A5C(MOD59_IntroOverlayData *data) //MOD59_Destroy... something? +void MOD59_021D7A5C(MOD59_IntroOverlayData *data) //MOD59_Destroy... something? { FUN_020145A8(data->unk68); } -THUMB_FUNC BOOL MOD59_FadeController(MOD59_IntroOverlayData *data, u32 bgId, u32 param2) +BOOL MOD59_FadeController(MOD59_IntroOverlayData *data, u32 bgId, u32 param2) { BOOL subScreen; GXBlendPlaneMask planeMask; @@ -795,7 +795,7 @@ THUMB_FUNC BOOL MOD59_FadeController(MOD59_IntroOverlayData *data, u32 bgId, u32 return ret; } -THUMB_FUNC BOOL MOD59_Timer(MOD59_IntroOverlayData *data, s32 timer) +BOOL MOD59_Timer(MOD59_IntroOverlayData *data, s32 timer) { if (data->tickTimer < timer) { @@ -809,14 +809,14 @@ THUMB_FUNC BOOL MOD59_Timer(MOD59_IntroOverlayData *data, s32 timer) } } -THUMB_FUNC void MOD59_TilemapChangePalette(MOD59_IntroOverlayData *data, u32 layer, u32 paletteNum) +void MOD59_TilemapChangePalette(MOD59_IntroOverlayData *data, u32 layer, u32 paletteNum) { //TODO: messy hack to trick compiler, fix BgTilemapRectChangePalette(data->bgConfig, layer & 0xFF, 0, 0, 32, 24, (u8)paletteNum); BgCommitTilemapBufferToVram(data->bgConfig, (u8)layer); } -THUMB_FUNC BOOL MOD59_DisplayMessage(MOD59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvance) +BOOL MOD59_DisplayMessage(MOD59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvance) { BOOL ret = FALSE; switch(data->displayMessageCounter) @@ -861,7 +861,7 @@ THUMB_FUNC BOOL MOD59_DisplayMessage(MOD59_IntroOverlayData *data, u32 msgNo, BO return ret; } -THUMB_FUNC void MOD59_PlaySelectSound(struct ListMenu *list, s32 index, u8 onInit) +void MOD59_PlaySelectSound(struct ListMenu *list, s32 index, u8 onInit) { #pragma unused(index) #pragma unused(list) @@ -871,7 +871,7 @@ THUMB_FUNC void MOD59_PlaySelectSound(struct ListMenu *list, s32 index, u8 onIni } } -THUMB_FUNC BOOL MOD59_CreateListWithText(MOD59_IntroOverlayData *data, u32 param1, u32 param2) +BOOL MOD59_CreateListWithText(MOD59_IntroOverlayData *data, u32 param1, u32 param2) { BOOL ret = FALSE; const struct WindowTemplate *windowTemplate; @@ -942,7 +942,7 @@ THUMB_FUNC BOOL MOD59_CreateListWithText(MOD59_IntroOverlayData *data, u32 param return ret; } -THUMB_FUNC BOOL MOD59_DisplayControlAdventureMessage(MOD59_IntroOverlayData *data, u32 msgNo, u32 param2, u32 tilemapTop, u32 height) +BOOL MOD59_DisplayControlAdventureMessage(MOD59_IntroOverlayData *data, u32 msgNo, u32 param2, u32 tilemapTop, u32 height) { BOOL ret = 0; switch (data->displayControlMessageCounter) @@ -1007,7 +1007,7 @@ THUMB_FUNC BOOL MOD59_DisplayControlAdventureMessage(MOD59_IntroOverlayData *dat return ret; } -THUMB_FUNC void MOD59_LoadInitialTilemap(MOD59_IntroOverlayData *data) +void MOD59_LoadInitialTilemap(MOD59_IntroOverlayData *data) { GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_main_background_tileset_NCGR, data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id); BG_ClearCharDataRange(GF_BG_LYR_MAIN_0, 0x20, 0, data->heap_id); @@ -1034,7 +1034,7 @@ THUMB_FUNC void MOD59_LoadInitialTilemap(MOD59_IntroOverlayData *data) BG_SetMaskColor(GF_BG_LYR_SUB_0, 0); } -THUMB_FUNC void MOD59_LoadMainScrnData(MOD59_IntroOverlayData *data) +void MOD59_LoadMainScrnData(MOD59_IntroOverlayData *data) { struct MOD59_UnkStruct021D9E30 scrnData = MOD59_021D9E1C; if (data->scrnDataIndexMain >= 5) @@ -1044,7 +1044,7 @@ THUMB_FUNC void MOD59_LoadMainScrnData(MOD59_IntroOverlayData *data) GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, scrnData.scrnIds[data->scrnDataIndexMain], data->bgConfig, GF_BG_LYR_MAIN_3, 0, 0, FALSE, data->heap_id); } -THUMB_FUNC void MOD59_LoadCharDataFromIndex(MOD59_IntroOverlayData *data) +void MOD59_LoadCharDataFromIndex(MOD59_IntroOverlayData *data) { struct MOD59_GraphicsPaletteMap021D9F90 graphicsPaletteMap = MOD59_021D9F90; if (data->spriteDataIndex0 != 0 && data->spriteDataIndex0 < 12) @@ -1063,7 +1063,7 @@ THUMB_FUNC void MOD59_LoadCharDataFromIndex(MOD59_IntroOverlayData *data) } } -THUMB_FUNC void MOD59_LoadSubScrnData(MOD59_IntroOverlayData *data) +void MOD59_LoadSubScrnData(MOD59_IntroOverlayData *data) { struct MOD59_UnkStruct021D9E30 scrnData = MOD59_021D9E30; if (data->scrnDataIndexSub >= 5) @@ -1082,7 +1082,7 @@ THUMB_FUNC void MOD59_LoadSubScrnData(MOD59_IntroOverlayData *data) } #ifdef NONMATCHING -THUMB_FUNC void MOD59_DrawMunchlax(MOD59_IntroOverlayData *data) +void MOD59_DrawMunchlax(MOD59_IntroOverlayData *data) { struct SomeDrawPokemonStruct drawStruct; FUN_02068C00(&drawStruct, SPECIES_MUNCHLAX, MON_MALE, 2, FALSE, 0, 0); @@ -1114,7 +1114,7 @@ THUMB_FUNC void MOD59_DrawMunchlax(MOD59_IntroOverlayData *data) FreeToHeap(src); } #else -THUMB_FUNC asm void MOD59_DrawMunchlax(MOD59_IntroOverlayData *data) +asm void MOD59_DrawMunchlax(MOD59_IntroOverlayData *data) { //clang-tidy off push {r3, r4, r5, r6, r7, lr} @@ -1266,7 +1266,7 @@ _021D82C8: } #endif -THUMB_FUNC void MOD59_LoadPokeballButton(MOD59_IntroOverlayData *data) +void MOD59_LoadPokeballButton(MOD59_IntroOverlayData *data) { GfGfxLoader_LoadScrnData(NARC_DEMO_INTRO_INTRO, NARC_intro_narc_0038_NSCR, data->bgConfig, GF_BG_LYR_SUB_2, 0, 0, FALSE, data->heap_id); MOD59_TilemapChangePalette(data, GF_BG_LYR_SUB_2, 9); @@ -1275,7 +1275,7 @@ THUMB_FUNC void MOD59_LoadPokeballButton(MOD59_IntroOverlayData *data) GfGfxLoader_LoadCharData(NARC_DEMO_INTRO_INTRO, NARC_intro_pokeball_button_1_NCGR, data->bgConfig, GF_BG_LYR_SUB_2, 0x20, 0, FALSE, data->heap_id); } -THUMB_FUNC BOOL MOD59_MoveSprite(MOD59_IntroOverlayData *data, u32 layer, u32 param2) +BOOL MOD59_MoveSprite(MOD59_IntroOverlayData *data, u32 layer, u32 param2) { BOOL ret = FALSE; if (param2 == 0) @@ -1324,7 +1324,7 @@ THUMB_FUNC BOOL MOD59_MoveSprite(MOD59_IntroOverlayData *data, u32 layer, u32 pa return ret; } -THUMB_FUNC void MOD59_ResetPlayerAnimation(MOD59_IntroOverlayData *data) +void MOD59_ResetPlayerAnimation(MOD59_IntroOverlayData *data) { data->maleAnimCounter = 0; data->maleAnimTimer = 0; @@ -1332,7 +1332,7 @@ THUMB_FUNC void MOD59_ResetPlayerAnimation(MOD59_IntroOverlayData *data) data->femaleAnimTimer = 0; } -THUMB_FUNC void MOD59_AnimatePlayerSprite(MOD59_IntroOverlayData *data) +void MOD59_AnimatePlayerSprite(MOD59_IntroOverlayData *data) { u32 timer; if (data->selectedGender == Male) @@ -1371,19 +1371,19 @@ THUMB_FUNC void MOD59_AnimatePlayerSprite(MOD59_IntroOverlayData *data) } } -THUMB_FUNC void MOD59_DisableBlend(MOD59_IntroOverlayData *data) +void MOD59_DisableBlend(MOD59_IntroOverlayData *data) { #pragma unused(data) reg_G2_BLDCNT = 0; } -THUMB_FUNC void MOD59_ResetPlayerShrinkAnimation(MOD59_IntroOverlayData *data) +void MOD59_ResetPlayerShrinkAnimation(MOD59_IntroOverlayData *data) { data->spriteDataIndex2 = 0; data->spriteData2Timer = 0; } -THUMB_FUNC BOOL MOD59_PlayerShrinkAnimation(MOD59_IntroOverlayData *data) +BOOL MOD59_PlayerShrinkAnimation(MOD59_IntroOverlayData *data) { BOOL ret = FALSE; u32 timer; @@ -1422,7 +1422,7 @@ THUMB_FUNC BOOL MOD59_PlayerShrinkAnimation(MOD59_IntroOverlayData *data) } #ifdef NONMATCHING -THUMB_FUNC BOOL MOD59_MunchlaxJumpAnimation(MOD59_IntroOverlayData *data, u32 *param1) +BOOL MOD59_MunchlaxJumpAnimation(MOD59_IntroOverlayData *data, u32 *param1) { BOOL ret = FALSE; u32 b0; @@ -1542,7 +1542,7 @@ THUMB_FUNC BOOL MOD59_MunchlaxJumpAnimation(MOD59_IntroOverlayData *data, u32 *p return ret; } #else -THUMB_FUNC asm BOOL MOD59_MunchlaxJumpAnimation(MOD59_IntroOverlayData *data, u32 *param1) +asm BOOL MOD59_MunchlaxJumpAnimation(MOD59_IntroOverlayData *data, u32 *param1) { //clang-tidy off push {r3, r4, r5, r6, r7, lr} @@ -1844,13 +1844,13 @@ _021D890A: } #endif -THUMB_FUNC void MOD59_ResetMunchlaxPriority(MOD59_IntroOverlayData *data) +void MOD59_ResetMunchlaxPriority(MOD59_IntroOverlayData *data) { #pragma unused (data) SetBgPriority(GF_BG_LYR_MAIN_2, 1); } -THUMB_FUNC BOOL MOD59_MasterController(MOD59_IntroOverlayData *data) +BOOL MOD59_MasterController(MOD59_IntroOverlayData *data) { BOOL ret = FALSE; switch (data->controllerCounter) diff --git a/arm9/modules/59/src/mod59_TV.c b/arm9/modules/59/src/mod59_TV.c index 0fa821612..bc570147a 100644 --- a/arm9/modules/59/src/mod59_TV.c +++ b/arm9/modules/59/src/mod59_TV.c @@ -125,7 +125,7 @@ const struct GraphicsBanks MOD59_021DA0D4 = .texpltt = GX_VRAM_TEXPLTT_NONE }; -THUMB_FUNC BOOL MOD59_TVInit(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_TVInit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused(status) CreateHeap(3, 83, 0x40000); @@ -137,7 +137,7 @@ THUMB_FUNC BOOL MOD59_TVInit(struct OverlayManager *overlayManager, u32 *status) } #ifdef NONMATCHING -THUMB_FUNC BOOL MOD59_TVMain(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_TVMain(struct OverlayManager *overlayManager, u32 *status) { MOD59_TVOverlayData *data = (MOD59_TVOverlayData *)OverlayManager_GetData(overlayManager); BOOL ret = FALSE; @@ -243,7 +243,7 @@ THUMB_FUNC BOOL MOD59_TVMain(struct OverlayManager *overlayManager, u32 *status) return ret; } #else -THUMB_FUNC asm BOOL MOD59_TVMain(struct OverlayManager *overlayManager, u32 *status) +asm BOOL MOD59_TVMain(struct OverlayManager *overlayManager, u32 *status) { push {r3, r4, r5, r6, lr} sub sp, #0xc @@ -409,7 +409,7 @@ _021D99E2: } #endif -THUMB_FUNC BOOL MOD59_TVExit(struct OverlayManager *overlayManager, u32 *status) +BOOL MOD59_TVExit(struct OverlayManager *overlayManager, u32 *status) { #pragma unused (status) u32 heap_id = ((MOD59_TVOverlayData *)OverlayManager_GetData(overlayManager))->heap_id; @@ -418,12 +418,12 @@ THUMB_FUNC BOOL MOD59_TVExit(struct OverlayManager *overlayManager, u32 *status) return TRUE; } -THUMB_FUNC void MOD59_TVDoGpuBgUpdate(MOD59_TVOverlayData *data) +void MOD59_TVDoGpuBgUpdate(MOD59_TVOverlayData *data) { DoScheduledBgGpuUpdates(data->bgConfig); } -THUMB_FUNC void MOD59_TVSetupGraphics(MOD59_TVOverlayData *data) +void MOD59_TVSetupGraphics(MOD59_TVOverlayData *data) { const struct GraphicsBanks banks = MOD59_021DA0D4; //sp #0x90 GX_SetBanks(&banks); @@ -467,7 +467,7 @@ THUMB_FUNC void MOD59_TVSetupGraphics(MOD59_TVOverlayData *data) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, (GXBlendPlaneMask)(GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BG2), 4, 12); } -THUMB_FUNC void MOD59_TVDestroyGraphics(MOD59_TVOverlayData *data) +void MOD59_TVDestroyGraphics(MOD59_TVOverlayData *data) { ToggleBgLayer(GF_BG_LYR_MAIN_0, GX_LAYER_TOGGLE_OFF); ToggleBgLayer(GF_BG_LYR_MAIN_1, GX_LAYER_TOGGLE_OFF); @@ -487,7 +487,7 @@ THUMB_FUNC void MOD59_TVDestroyGraphics(MOD59_TVOverlayData *data) FreeToHeap(data->bgConfig); } -THUMB_FUNC void MOD59_TVSetupMsg(MOD59_TVOverlayData *data) +void MOD59_TVSetupMsg(MOD59_TVOverlayData *data) { data->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, NARC_msg_narc_0549_bin, data->heap_id); @@ -496,12 +496,12 @@ THUMB_FUNC void MOD59_TVSetupMsg(MOD59_TVOverlayData *data) data->unk0C = 0; } -THUMB_FUNC void MOD59_TVDestroyMsg(MOD59_TVOverlayData *data) +void MOD59_TVDestroyMsg(MOD59_TVOverlayData *data) { DestroyMsgData(data->msgData); } -THUMB_FUNC BOOL MOD59_021D9C74(MOD59_TVOverlayData *data, u32 msgNo, u32 param2, u32 param3) +BOOL MOD59_021D9C74(MOD59_TVOverlayData *data, u32 msgNo, u32 param2, u32 param3) { BOOL ret = FALSE; switch (data->unk0C) @@ -550,7 +550,7 @@ THUMB_FUNC BOOL MOD59_021D9C74(MOD59_TVOverlayData *data, u32 msgNo, u32 param2, return ret; } -THUMB_FUNC void MOD59_021D9D78(MOD59_TVOverlayData *data) +void MOD59_021D9D78(MOD59_TVOverlayData *data) { data->unk20 += 4; BgSetPosTextAndCommit(data->bgConfig, GF_BG_LYR_MAIN_1, BG_POS_OP_SET_Y, data->unk20 >> 4); diff --git a/arm9/modules/62/src/module_62_sinit.c b/arm9/modules/62/src/module_62_sinit.c index db679e412..b3167a26a 100644 --- a/arm9/modules/62/src/module_62_sinit.c +++ b/arm9/modules/62/src/module_62_sinit.c @@ -4,7 +4,7 @@ FS_EXTERN_OVERLAY(MODULE_08); -THUMB_FUNC static void MOD62_0222D5C0(void) +static void MOD62_0222D5C0(void) { HandleLoadOverlay(FS_OVERLAY_ID(MODULE_08), 2); } diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 1ca7df19e..69aeded09 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -41,7 +41,7 @@ struct UnkStruct_02006D98_2 * FUN_0201341C(struct UnkStruct63_021DB450 *); const s32 MOD63_021DBEC0[3] = {0x703, 0x7CE, 0x8A8}; const struct UnkStruct63_021DBEF0 MOD63_021DBEF0[3]; -THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1) +u32 MOD63_021DB450(u32 param0, u32 param1) { u32 res0 = (NNS_GfdDefaultFuncAllocTexVram)(param0, param1, 0); FUN_0201327C(res0); @@ -49,7 +49,7 @@ THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1) return (u32)((u16)res0 * 8); } -THUMB_FUNC u32 MOD63_021DB474(u32 param0, u32 param1) +u32 MOD63_021DB474(u32 param0, u32 param1) { u32 res0 = (NNS_GfdDefaultFuncAllocPlttVram)(param0, param1, 1); GF_ASSERT(res0); @@ -57,12 +57,12 @@ THUMB_FUNC u32 MOD63_021DB474(u32 param0, u32 param1) return (u32)((u16)res0 * 8); } -THUMB_FUNC u32 MOD63_021DB498(void) +u32 MOD63_021DB498(void) { return 32; } -THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO: this does a lot more than setup anim sprites +void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO: this does a lot more than setup anim sprites { struct UnkStruct_02006D98_4 sp1C; int introMonArray[3] = {SPECIES_TURTWIG, SPECIES_CHIMCHAR, SPECIES_PIPLUP}; @@ -84,14 +84,14 @@ THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg FUN_02013194(arg0->field_18, FUN_0201318C(0x3D, 4, 0x4C), 10, 1); } -THUMB_FUNC void MOD63_021DB580(UnkStruct63_021DB450 *param0) +void MOD63_021DB580(UnkStruct63_021DB450 *param0) { FUN_02012DE4(param0->field_18); FreeToHeap(param0->field_14); FUN_020072E8(param0->field_00); } -THUMB_FUNC void MOD63_021DB598(UnkStruct63_021DB450 *param0) +void MOD63_021DB598(UnkStruct63_021DB450 *param0) { if (param0 == NULL) { @@ -100,7 +100,7 @@ THUMB_FUNC void MOD63_021DB598(UnkStruct63_021DB450 *param0) FUN_020081C4(param0->field_00); } -THUMB_FUNC void MOD63_021DB5A8(UnkStruct63_021DB450 *param0) +void MOD63_021DB5A8(UnkStruct63_021DB450 *param0) { if (param0 == NULL) { @@ -131,7 +131,7 @@ const struct UnkStruct63_021DBEF0 MOD63_021DBF08[3] = { //no idea if this is the {0, 1} }; -THUMB_FUNC BOOL MOD63_021DB5CC(UnkStruct63_021DB450 *param0, u32 param1, s32 param2) +BOOL MOD63_021DB5CC(UnkStruct63_021DB450 *param0, u32 param1, s32 param2) { u8 * state = ¶m0->field_1C; switch(*state) @@ -184,7 +184,7 @@ THUMB_FUNC BOOL MOD63_021DB5CC(UnkStruct63_021DB450 *param0, u32 param1, s32 par return FALSE; } -THUMB_FUNC BOOL MOD63_021DB720(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB720(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0x0, 0x6); @@ -201,7 +201,7 @@ THUMB_FUNC BOOL MOD63_021DB720(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC BOOL MOD63_021DB784(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB784(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0x0, -0x3); @@ -216,7 +216,7 @@ THUMB_FUNC BOOL MOD63_021DB784(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC BOOL MOD63_021DB7D0(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB7D0(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0x0, -0x10); @@ -233,7 +233,7 @@ THUMB_FUNC BOOL MOD63_021DB7D0(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC BOOL MOD63_021DB838(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB838(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0, -0x6); @@ -248,7 +248,7 @@ THUMB_FUNC BOOL MOD63_021DB838(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC BOOL MOD63_021DB884(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB884(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0, 0x8); @@ -265,7 +265,7 @@ THUMB_FUNC BOOL MOD63_021DB884(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC BOOL MOD63_021DB8E8(UnkStruct63_021DB450 *param0, u32 param1) +BOOL MOD63_021DB8E8(UnkStruct63_021DB450 *param0, u32 param1) { struct UnkStruct_02006D98_2 *field = param0->field_04[param1]; FUN_020079E0(field, 0, 0x6); @@ -280,13 +280,13 @@ THUMB_FUNC BOOL MOD63_021DB8E8(UnkStruct63_021DB450 *param0, u32 param1) return FALSE; } -THUMB_FUNC void MOD63_021DB934(void) +void MOD63_021DB934(void) { FUN_02013364(); FUN_02013388(); } -THUMB_FUNC void MOD63_021DB940(struct UnkStruct63_021DB450 * a0) +void MOD63_021DB940(struct UnkStruct63_021DB450 * a0) { struct UnkStruct_02006D98_2 * r4 = FUN_0201341C(a0); int sp0[3] = {0, 0, 0}; diff --git a/arm9/src/GX_layers.c b/arm9/src/GX_layers.c index 44634e129..525e4d85a 100644 --- a/arm9/src/GX_layers.c +++ b/arm9/src/GX_layers.c @@ -1,3 +1,4 @@ +#include "global.h" #include "GX_layers.h" #include "GX_vramcnt.h" #include "gx.h" @@ -8,7 +9,7 @@ static u32 EngineA_DISPCNT_LayerMask; static u32 EngineB_DISPCNT_LayerMask; -THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks) +void GX_SetBanks(const struct GraphicsBanks *banks) { GX_ResetBankForBG(); GX_ResetBankForBGExtPltt(); @@ -34,12 +35,12 @@ THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks) } -THUMB_FUNC void GX_DisableEngineALayers() +void GX_DisableEngineALayers() { EngineA_DISPCNT_LayerMask = 0; } -THUMB_FUNC void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle) +void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle) { if (layer_toggle == GX_LAYER_TOGGLE_ON) { @@ -59,18 +60,18 @@ THUMB_FUNC void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_togg GX_SetVisiblePlane(EngineA_DISPCNT_LayerMask ^= layer_mask); } -THUMB_FUNC void GX_SetEngineALayers(u32 layer_mask) +void GX_SetEngineALayers(u32 layer_mask) { EngineA_DISPCNT_LayerMask = layer_mask; GX_SetVisiblePlane(layer_mask); } -THUMB_FUNC void GX_DisableEngineBLayers() +void GX_DisableEngineBLayers() { EngineB_DISPCNT_LayerMask = 0; } -THUMB_FUNC void GX_EngineBToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle) +void GX_EngineBToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle) { if (layer_toggle == GX_LAYER_TOGGLE_ON) { @@ -90,13 +91,13 @@ THUMB_FUNC void GX_EngineBToggleLayers(u32 layer_mask, GX_LayerToggle layer_togg GXS_SetVisiblePlane(EngineB_DISPCNT_LayerMask ^= layer_mask); } -THUMB_FUNC void GX_BothDispOn() +void GX_BothDispOn() { GX_DispOn(); GXS_DispOn(); } -THUMB_FUNC void GX_SwapDisplay() +void GX_SwapDisplay() { if (gSystem.screensFlipped == 0) { @@ -108,7 +109,7 @@ THUMB_FUNC void GX_SwapDisplay() } } -THUMB_FUNC u32 GX_GetEngineALayers() +u32 GX_GetEngineALayers() { return EngineA_DISPCNT_LayerMask; } diff --git a/arm9/src/WIFI_stubsmd5_dummy.c b/arm9/src/WIFI_stubsmd5_dummy.c deleted file mode 100644 index 6de2edca5..000000000 --- a/arm9/src/WIFI_stubsmd5_dummy.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "function_target.h" -#include "WIFI_stubsmd5_dummy.h" - -ARM_FUNC void MD5Final(u8 *digest, struct DGTHash1Context *context) -{ - DGT_Hash1GetDigest_R(digest, context); -} - -ARM_FUNC void MD5Update(struct DGTHash1Context *context, u8 *input, u32 length) -{ - DGT_Hash1SetSource(context, input, length); -} - -ARM_FUNC void MD5Init(struct DGTHash1Context *context) -{ - DGT_Hash1Reset(context); -} diff --git a/arm9/src/bag.c b/arm9/src/bag.c index 2a5f48906..29fcb49f8 100644 --- a/arm9/src/bag.c +++ b/arm9/src/bag.c @@ -4,8 +4,6 @@ #include "itemtool.h" #include "heap.h" -#pragma thumb on - u32 Save_Bag_sizeof(void) { return sizeof(struct Bag); diff --git a/arm9/src/bag_view.c b/arm9/src/bag_view.c index beecfbbb7..c09f6471b 100644 --- a/arm9/src/bag_view.c +++ b/arm9/src/bag_view.c @@ -23,7 +23,7 @@ extern u8 SealCase_CountSealOccurrenceAnywhere(struct SealCase *, u32); static u32 GetCoinCount(struct SaveBlock2 *sav2); static u32 GetSealCount(struct SaveBlock2 *sav2); -THUMB_FUNC struct BagView *BagView_New(u8 heap_id) +struct BagView *BagView_New(u8 heap_id) { struct BagView *ptr = AllocFromHeap(heap_id, sizeof(struct BagView)); @@ -32,17 +32,17 @@ THUMB_FUNC struct BagView *BagView_New(u8 heap_id) return ptr; } -THUMB_FUNC u32 BagView_sizeof() +u32 BagView_sizeof() { return sizeof(struct BagView); } -THUMB_FUNC void FUN_0206E30C(struct BagView *bag_view, u8 r1) +void FUN_0206E30C(struct BagView *bag_view, u8 r1) { bag_view->unk65 = r1; } -THUMB_FUNC void FUN_0206E314( +void FUN_0206E314( struct BagView *bag_view, struct SaveBlock2 *sav2, u8 r2, struct UnkStruct_0206F164 *r3) { FUN_0206E30C(bag_view, r2); @@ -52,58 +52,58 @@ THUMB_FUNC void FUN_0206E314( bag_view->unk66 = 0; } -THUMB_FUNC void BagView_SetItem(struct BagView *bag_view, struct ItemSlot *slot, u8 pocket, u8 idx) +void BagView_SetItem(struct BagView *bag_view, struct ItemSlot *slot, u8 pocket, u8 idx) { bag_view->slots[idx].slot = slot; bag_view->slots[idx].pocket = pocket; } -THUMB_FUNC void FUN_0206E340(struct BagView *bag_view) +void FUN_0206E340(struct BagView *bag_view) { bag_view->unk76 = 1; } -THUMB_FUNC void FUN_0206E354(struct BagView *bag_view, u32 r1) +void FUN_0206E354(struct BagView *bag_view, u32 r1) { bag_view->unk70 = r1; } -THUMB_FUNC void FUN_0206E358(struct BagView *bag_view, u8 r1) +void FUN_0206E358(struct BagView *bag_view, u8 r1) { bag_view->unk74 = r1; } -THUMB_FUNC void FUN_0206E360(struct BagView *bag_view, u16 r1) +void FUN_0206E360(struct BagView *bag_view, u16 r1) { bag_view->unk76_2 = r1; } -THUMB_FUNC u16 FUN_0206E37C(struct BagView *bag_view) +u16 FUN_0206E37C(struct BagView *bag_view) { return bag_view->unk66; } -THUMB_FUNC u16 FUN_0206E384(struct BagView *bag_view) +u16 FUN_0206E384(struct BagView *bag_view) { return bag_view->unk68; } -THUMB_FUNC u8 FUN_0206E38C(struct BagView *bag_view) +u8 FUN_0206E38C(struct BagView *bag_view) { return bag_view->unk74; } -THUMB_FUNC u8 FUN_0206E394(struct BagView *bag_view) +u8 FUN_0206E394(struct BagView *bag_view) { return bag_view->unk75; } -THUMB_FUNC static u32 GetCoinCount(struct SaveBlock2 *sav2) +static u32 GetCoinCount(struct SaveBlock2 *sav2) { return (u32)CheckCoins(Save_PlayerData_GetCoinsAddr(sav2)); } -THUMB_FUNC static u32 GetSealCount(struct SaveBlock2 *sav2) +static u32 GetSealCount(struct SaveBlock2 *sav2) { struct SealCase *seal_case = Save_SealCase_Get(sav2); u32 i; @@ -118,22 +118,22 @@ THUMB_FUNC static u32 GetSealCount(struct SaveBlock2 *sav2) } //todo: do these match up with HG? -THUMB_FUNC u32 FUN_0206E3C8(struct SaveBlock2 *sav2) +u32 FUN_0206E3C8(struct SaveBlock2 *sav2) { return FUN_02027168(FUN_0202708C(Save_FashionData_Get(sav2))); } -THUMB_FUNC u32 FUN_0206E3D8(struct SaveBlock2 *sav2) +u32 FUN_0206E3D8(struct SaveBlock2 *sav2) { return FUN_02027184(FUN_0202708C(Save_FashionData_Get(sav2))); } -THUMB_FUNC u32 FUN_0206E3E8(struct SaveBlock2 *sav2) +u32 FUN_0206E3E8(struct SaveBlock2 *sav2) { return SaveStruct23_Substruct2_SetField_0x0(SaveStruct23_GetSubstruct2(sav2), 0, DATA_GET); } -THUMB_FUNC BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveBlock2 *sav2, struct String *dest, u32 item_id, u32 heap_id) +BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveBlock2 *sav2, struct String *dest, u32 item_id, u32 heap_id) { struct MsgData *msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_MSGDATA_MSG, NARC_msg_narc_0007_bin, heap_id); MessageFormat *messageFormat = MessageFormat_New(heap_id); @@ -184,7 +184,7 @@ THUMB_FUNC BOOL TryFormatRegisteredKeyItemUseMessage(struct SaveBlock2 *sav2, st return TRUE; } -THUMB_FUNC void FUN_0206E51C( //todo: sync with HG +void FUN_0206E51C( //todo: sync with HG struct PlayerData *playerData, struct String *dest, u32 r2, u32 r3, u32 heap_id) { #pragma unused(r2) diff --git a/arm9/src/bg_window.c b/arm9/src/bg_window.c index 688fb2e1e..feeb8687d 100644 --- a/arm9/src/bg_window.c +++ b/arm9/src/bg_window.c @@ -50,7 +50,7 @@ void (*const sClearWindowTilemapFuncs[])(struct Window *) = { ClearWindowTilemapText, }; -THUMB_FUNC struct BgConfig *BgConfig_Alloc(u32 heap_id) +struct BgConfig *BgConfig_Alloc(u32 heap_id) { struct BgConfig *ptr = AllocFromHeap(heap_id, sizeof(struct BgConfig)); memset(ptr, 0, sizeof(struct BgConfig)); @@ -61,12 +61,12 @@ THUMB_FUNC struct BgConfig *BgConfig_Alloc(u32 heap_id) return ptr; } -THUMB_FUNC u32 BgConfig_GetHeapId(struct BgConfig *bgConfig) +u32 BgConfig_GetHeapId(struct BgConfig *bgConfig) { return bgConfig->heap_id; } -THUMB_FUNC void SetBothScreensModesAndDisable(const struct GraphicsModes *modes) +void SetBothScreensModesAndDisable(const struct GraphicsModes *modes) { GX_SetGraphicsMode(modes->dispMode, modes->bgMode, modes->_2d3dMode); GXS_SetGraphicsMode(modes->subMode); @@ -77,7 +77,7 @@ THUMB_FUNC void SetBothScreensModesAndDisable(const struct GraphicsModes *modes) GX_DisableEngineBLayers(); } -THUMB_FUNC void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, u32 whichScreen) +void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, u32 whichScreen) { if (whichScreen == 0) { @@ -91,7 +91,7 @@ THUMB_FUNC void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, u3 } } -THUMB_FUNC void InitBgFromTemplate( +void InitBgFromTemplate( struct BgConfig *bgConfig, u8 bgId, const struct BgTemplate *template, u8 bgMode) { u8 screenSize = TranslateGFBgModePairToGXScreenSize((enum GFBgScreenSize)template->size, (enum GFBgType)bgMode); @@ -241,7 +241,7 @@ THUMB_FUNC void InitBgFromTemplate( BgSetPosTextAndCommit(bgConfig, (enum GFBgLayer)bgId, BG_POS_OP_SET_Y, template->y); } -THUMB_FUNC void SetBgControlParam(struct BgConfig *config, u8 bgId, u32 attr, u8 value) +void SetBgControlParam(struct BgConfig *config, u8 bgId, u32 attr, u8 value) { if (attr == GF_BG_CNT_SET_COLOR_MODE) { @@ -485,7 +485,7 @@ THUMB_FUNC void SetBgControlParam(struct BgConfig *config, u8 bgId, u32 attr, u8 } } -THUMB_FUNC u8 TranslateGFBgModePairToGXScreenSize(enum GFBgScreenSize size, enum GFBgType type) +u8 TranslateGFBgModePairToGXScreenSize(enum GFBgScreenSize size, enum GFBgType type) { switch (type) { @@ -553,7 +553,7 @@ THUMB_FUNC u8 TranslateGFBgModePairToGXScreenSize(enum GFBgScreenSize size, enum return GX_BG_SCRSIZE_TEXT_256x256; // GX_BG_SCRSIZE_AFFINE_128x128; GX_BG_SCRSIZE_256x16PLTT_128x128; } -THUMB_FUNC void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p) +void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p) { switch (screenSize) { @@ -584,7 +584,7 @@ THUMB_FUNC void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p) } } -THUMB_FUNC void FreeBgTilemapBuffer(struct BgConfig *bgConfig, u32 bgId) +void FreeBgTilemapBuffer(struct BgConfig *bgConfig, u32 bgId) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { @@ -593,7 +593,7 @@ THUMB_FUNC void FreeBgTilemapBuffer(struct BgConfig *bgConfig, u32 bgId) } } -THUMB_FUNC void SetBgPriority(u32 bgId, u16 priority) +void SetBgPriority(u32 bgId, u16 priority) { switch (bgId) { @@ -624,7 +624,7 @@ THUMB_FUNC void SetBgPriority(u32 bgId, u16 priority) } } -THUMB_FUNC void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle) +void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle) { switch (bgId) { @@ -655,7 +655,7 @@ THUMB_FUNC void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle) } } -THUMB_FUNC void BgSetPosTextAndCommit(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 val) //seems to apply to more than just text? name? +void BgSetPosTextAndCommit(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 val) //seems to apply to more than just text? name? { Bg_SetPosText(&bgConfig->bgs[bgId], op, val); @@ -719,17 +719,17 @@ THUMB_FUNC void BgSetPosTextAndCommit(struct BgConfig *bgConfig, u32 bgId, u32 o } } -THUMB_FUNC fx32 Bg_GetXpos(struct BgConfig *bgConfig, u32 bgId) +fx32 Bg_GetXpos(struct BgConfig *bgConfig, u32 bgId) { return bgConfig->bgs[bgId].hOffset; } -THUMB_FUNC fx32 Bg_GetYpos(struct BgConfig *bgConfig, u32 bgId) +fx32 Bg_GetYpos(struct BgConfig *bgConfig, u32 bgId) { return bgConfig->bgs[bgId].vOffset; } -THUMB_FUNC void Bg_SetTextDimAndAffineParams(struct BgConfig *bgConfig, +void Bg_SetTextDimAndAffineParams(struct BgConfig *bgConfig, u32 bgId, u32 txOp, fx32 txVal, @@ -741,7 +741,7 @@ THUMB_FUNC void Bg_SetTextDimAndAffineParams(struct BgConfig *bgConfig, SetBgAffine(bgConfig, bgId, mtx, centerX, centerY); } -THUMB_FUNC void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val) +void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val) { switch (op) { @@ -766,7 +766,7 @@ THUMB_FUNC void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val) } } -THUMB_FUNC void SetBgAffine( +void SetBgAffine( struct BgConfig *bgConfig, u32 bgId, struct Mtx22 *mtx, fx32 centerX, fx32 centerY) { switch (bgId) @@ -786,14 +786,14 @@ THUMB_FUNC void SetBgAffine( } } -THUMB_FUNC void BgAffineReset(struct BgConfig *bgConfig, u32 bgId) +void BgAffineReset(struct BgConfig *bgConfig, u32 bgId) { struct Mtx22 mtx; MTX22_2DAffine(&mtx, 0, FX32_ONE, FX32_ONE, 0); SetBgAffine(bgConfig, bgId, &mtx, 0, 0); } -THUMB_FUNC void CopyOrUncompressTilemapData(const void *src, void *dest, u32 size) +void CopyOrUncompressTilemapData(const void *src, void *dest, u32 size) { if (size == 0) { @@ -810,7 +810,7 @@ THUMB_FUNC void CopyOrUncompressTilemapData(const void *src, void *dest, u32 siz MI_CpuCopy16(src, dest, size); } -THUMB_FUNC void BgCommitTilemapBufferToVram(struct BgConfig *bgConfig, u32 bgId) +void BgCommitTilemapBufferToVram(struct BgConfig *bgConfig, u32 bgId) { BgCopyOrUncompressTilemapBufferRangeToVram(bgConfig, bgId, @@ -819,7 +819,7 @@ THUMB_FUNC void BgCommitTilemapBufferToVram(struct BgConfig *bgConfig, u32 bgId) bgConfig->bgs[bgId].baseTile); } -THUMB_FUNC void BgCopyOrUncompressTilemapBufferRangeToVram( +void BgCopyOrUncompressTilemapBufferRangeToVram( struct BgConfig *bgConfig, u32 bgId, u32 *src, u32 size, u32 tileOffset) { if (size == 0) @@ -843,7 +843,7 @@ THUMB_FUNC void BgCopyOrUncompressTilemapBufferRangeToVram( LoadBgVramScr(bgId, src, tileOffset * 2, size); } -THUMB_FUNC void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) +void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) { DC_FlushRange(buffer_p, size); @@ -876,13 +876,13 @@ THUMB_FUNC void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) } } -THUMB_FUNC void BG_LoadScreenTilemapData( +void BG_LoadScreenTilemapData( struct BgConfig *bgConfig, u32 bgId, void *src, u32 numTiles) { CopyOrUncompressTilemapData(src, bgConfig->bgs[bgId].tilemapBuffer, numTiles); } -THUMB_FUNC void BG_LoadCharTilesData( +void BG_LoadCharTilesData( struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 offset, u32 numTiles) { if (bgConfig->bgs[bgId].colorMode == GX_BG_COLORMODE_16) @@ -893,7 +893,7 @@ THUMB_FUNC void BG_LoadCharTilesData( BG_LoadCharPixelData(bgConfig, bgId, charData, offset, numTiles << 6); } -THUMB_FUNC void BG_LoadCharPixelData( +void BG_LoadCharPixelData( struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 size, u32 offset) { if (size == 0) @@ -910,7 +910,7 @@ THUMB_FUNC void BG_LoadCharPixelData( LoadBgVramChar(bgId, charData, offset, size); } -THUMB_FUNC void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size) +void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size) { DC_FlushRange(buffer_p, size); @@ -943,7 +943,7 @@ THUMB_FUNC void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size) } } -THUMB_FUNC void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_id) +void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_id) { void *ptr = AllocFromHeapAtEnd(heap_id, size); memset(ptr, 0, size); @@ -952,7 +952,7 @@ THUMB_FUNC void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_i FreeToHeapExplicit(heap_id, ptr); } -THUMB_FUNC void BG_FillCharDataRange( +void BG_FillCharDataRange( struct BgConfig *param0, u32 bgId, u32 fillValue, u32 count, u32 offset) { void *st4; @@ -976,7 +976,7 @@ THUMB_FUNC void BG_FillCharDataRange( FreeToHeap(st4); } -THUMB_FUNC void BG_LoadPlttData(u32 location, void *plttData, u32 size, u32 offset) +void BG_LoadPlttData(u32 location, void *plttData, u32 size, u32 offset) { DC_FlushRange(plttData, size); if (location < GF_PAL_LOCATION_SUB_BG) @@ -988,12 +988,12 @@ THUMB_FUNC void BG_LoadPlttData(u32 location, void *plttData, u32 size, u32 offs GXS_LoadBGPltt(plttData, offset, size); } -THUMB_FUNC void BG_SetMaskColor(u32 bgId, u32 value) +void BG_SetMaskColor(u32 bgId, u32 value) { BG_LoadPlttData(bgId, &value, 2, 0); } -THUMB_FUNC u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize) +u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize) { switch (screenSize) { @@ -1015,7 +1015,7 @@ THUMB_FUNC u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize) return x; } -THUMB_FUNC u16 GetSrcTileMapIndexFromCoords(u8 x, u8 y, u8 width, u8 height) +u16 GetSrcTileMapIndexFromCoords(u8 x, u8 y, u8 width, u8 height) { u8 coordType = 0; u16 r3 = 0; @@ -1076,7 +1076,7 @@ THUMB_FUNC u16 GetSrcTileMapIndexFromCoords(u8 x, u8 y, u8 width, u8 height) return r3; } -THUMB_FUNC void LoadRectToBgTilemapRect(struct BgConfig *bgConfig, +void LoadRectToBgTilemapRect(struct BgConfig *bgConfig, u32 bgId, void *src, u8 dstX, @@ -1087,7 +1087,7 @@ THUMB_FUNC void LoadRectToBgTilemapRect(struct BgConfig *bgConfig, CopyToBgTilemapRect(bgConfig, bgId, dstX, dstY, width, height, src, 0, 0, width, height); } -THUMB_FUNC void CopyToBgTilemapRect(struct BgConfig *bgConfig, +void CopyToBgTilemapRect(struct BgConfig *bgConfig, u32 bgId, u8 dstX, u8 dstY, @@ -1129,7 +1129,7 @@ THUMB_FUNC void CopyToBgTilemapRect(struct BgConfig *bgConfig, } } -THUMB_FUNC void CopyRectToBgTilemapRect(struct BgConfig *bgConfig, +void CopyRectToBgTilemapRect(struct BgConfig *bgConfig, u32 bgId, u8 dstX, u8 dstY, @@ -1171,7 +1171,7 @@ THUMB_FUNC void CopyRectToBgTilemapRect(struct BgConfig *bgConfig, } } -THUMB_FUNC void CopyBgTilemapRectText(struct Bg *bg, +void CopyBgTilemapRectText(struct Bg *bg, u8 dstX, u8 dstY, u8 dstWidth, @@ -1264,7 +1264,7 @@ THUMB_FUNC void CopyBgTilemapRectText(struct Bg *bg, } } -THUMB_FUNC void CopyBgTilemapRectAffine(struct Bg *bg, +void CopyBgTilemapRectAffine(struct Bg *bg, u8 dstX, u8 dstY, u8 dstWidth, @@ -1357,7 +1357,7 @@ THUMB_FUNC void CopyBgTilemapRectAffine(struct Bg *bg, } } -THUMB_FUNC void FillBgTilemapRect(struct BgConfig *bgConfig, +void FillBgTilemapRect(struct BgConfig *bgConfig, u8 bgId, u16 fillValue, u8 x, @@ -1377,7 +1377,7 @@ THUMB_FUNC void FillBgTilemapRect(struct BgConfig *bgConfig, } } -THUMB_FUNC void FillBgTilemapRectText(struct Bg *bg, +void FillBgTilemapRectText(struct Bg *bg, u16 fillValue, u8 x, u8 y, @@ -1429,7 +1429,7 @@ THUMB_FUNC void FillBgTilemapRectText(struct Bg *bg, } } -THUMB_FUNC void FillBgTilemapRectAffine( +void FillBgTilemapRectAffine( struct Bg *bg, u8 fillValue, u8 x, u8 y, u8 width, u8 height) { void *tilemapBuffer = bg->tilemapBuffer; @@ -1463,7 +1463,7 @@ THUMB_FUNC void FillBgTilemapRectAffine( } } -THUMB_FUNC void BgTilemapRectChangePalette(struct BgConfig *bgConfig, +void BgTilemapRectChangePalette(struct BgConfig *bgConfig, u32 bgId, u8 x, u8 y, @@ -1502,7 +1502,7 @@ THUMB_FUNC void BgTilemapRectChangePalette(struct BgConfig *bgConfig, } } -THUMB_FUNC void BgClearTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId) +void BgClearTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { @@ -1511,7 +1511,7 @@ THUMB_FUNC void BgClearTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgI } } -THUMB_FUNC void BgFillTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) +void BgFillTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { @@ -1520,7 +1520,7 @@ THUMB_FUNC void BgFillTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId } } -THUMB_FUNC void BgFillTilemapBufferAndSchedule(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) +void BgFillTilemapBufferAndSchedule(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { @@ -1529,7 +1529,7 @@ THUMB_FUNC void BgFillTilemapBufferAndSchedule(struct BgConfig *bgConfig, u32 bg } } -THUMB_FUNC void *BgGetCharPtr(u32 bgId) +void *BgGetCharPtr(u32 bgId) { switch (bgId) { @@ -1554,7 +1554,7 @@ THUMB_FUNC void *BgGetCharPtr(u32 bgId) return NULL; } -THUMB_FUNC void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), u8 paletteNum) +void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), u8 paletteNum) { paletteNum <<= 4; for (u32 i = 0; i < size; i++) @@ -1573,7 +1573,7 @@ THUMB_FUNC void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), } } -THUMB_FUNC u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_id) +u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_id) { u8 *ptr = (u8*)AllocFromHeap(heap_id, size * 2); @@ -1582,17 +1582,17 @@ THUMB_FUNC u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_ return ptr; } -THUMB_FUNC void *GetBgTilemapBuffer(struct BgConfig *bgConfig, u8 bgId) +void *GetBgTilemapBuffer(struct BgConfig *bgConfig, u8 bgId) { return bgConfig->bgs[bgId].tilemapBuffer; } -THUMB_FUNC u16 GetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId) +u16 GetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId) { return bgConfig->bgs[bgId].rotation; } -THUMB_FUNC u8 GetBgPriority(struct BgConfig *bgConfig, u32 bgId) +u8 GetBgPriority(struct BgConfig *bgConfig, u32 bgId) { switch (bgId) { @@ -1663,7 +1663,7 @@ THUMB_FUNC u8 GetBgPriority(struct BgConfig *bgConfig, u32 bgId) #define GetPixelAddressFromBlit8bpp(ptr, x, y, width) ((u8 *)((ptr) + ((x) & 7) + (((x) << 3) & 0x7FC0) + ((((y) << 3) & 0x7FC0) * (width)) + (((u32)(((y) << 3) & 0x38))))) #define ConvertPixelsToTiles(x) (((x) + ((x) & 7)) >> 3) -THUMB_FUNC void BlitBitmapRect4Bit(const struct Bitmap *src, +void BlitBitmapRect4Bit(const struct Bitmap *src, const struct Bitmap *dst, u16 srcX, u16 srcY, @@ -1726,7 +1726,7 @@ THUMB_FUNC void BlitBitmapRect4Bit(const struct Bitmap *src, } } -THUMB_FUNC void BlitBitmapRect8Bit(const struct Bitmap *src, +void BlitBitmapRect8Bit(const struct Bitmap *src, const struct Bitmap *dst, u16 srcX, u16 srcY, @@ -1782,7 +1782,7 @@ THUMB_FUNC void BlitBitmapRect8Bit(const struct Bitmap *src, } } -THUMB_FUNC void FillBitmapRect4Bit( +void FillBitmapRect4Bit( struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue) { @@ -1822,7 +1822,7 @@ THUMB_FUNC void FillBitmapRect4Bit( } } -THUMB_FUNC void FillBitmapRect8Bit( +void FillBitmapRect8Bit( struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue) { @@ -1853,7 +1853,7 @@ THUMB_FUNC void FillBitmapRect8Bit( } } -THUMB_FUNC struct Window *AllocWindows(u32 heap_id, s32 size) +struct Window *AllocWindows(u32 heap_id, s32 size) { struct Window *ptr = AllocFromHeap(heap_id, (u32)(size << 4)); @@ -1865,7 +1865,7 @@ THUMB_FUNC struct Window *AllocWindows(u32 heap_id, s32 size) return ptr; } -THUMB_FUNC void InitWindow(struct Window *window) +void InitWindow(struct Window *window) { window->bgConfig = NULL; window->bgId = GF_BG_LYR_UNALLOC; @@ -1881,7 +1881,7 @@ THUMB_FUNC void InitWindow(struct Window *window) window->colorMode = GF_BG_CLR_4BPP; } -THUMB_FUNC BOOL WindowIsInUse(struct Window *window) +BOOL WindowIsInUse(struct Window *window) { if (window->bgConfig == NULL || window->bgId == 0xff || window->pixelBuffer == NULL) { @@ -1891,7 +1891,7 @@ THUMB_FUNC BOOL WindowIsInUse(struct Window *window) return TRUE; } -THUMB_FUNC void AddWindowParameterized(struct BgConfig *param0, +void AddWindowParameterized(struct BgConfig *param0, struct Window *window, u8 bgId, u8 tilemapLeft, @@ -1926,7 +1926,7 @@ THUMB_FUNC void AddWindowParameterized(struct BgConfig *param0, window->colorMode = param0->bgs[bgId].colorMode == GX_BG_COLORMODE_16 ? GF_BG_CLR_4BPP : GF_BG_CLR_8BPP; } -THUMB_FUNC void AddTextWindowTopLeftCorner(struct BgConfig *param0, +void AddTextWindowTopLeftCorner(struct BgConfig *param0, struct Window *window, u8 width, u8 height, @@ -1951,7 +1951,7 @@ THUMB_FUNC void AddTextWindowTopLeftCorner(struct BgConfig *param0, } } -THUMB_FUNC void AddWindow( +void AddWindow( struct BgConfig *bgConfig, struct Window *window, const struct WindowTemplate *template) { @@ -1966,7 +1966,7 @@ THUMB_FUNC void AddWindow( template->baseTile); } -THUMB_FUNC void RemoveWindow(struct Window *window) +void RemoveWindow(struct Window *window) { FreeToHeap(window->pixelBuffer); @@ -1981,7 +1981,7 @@ THUMB_FUNC void RemoveWindow(struct Window *window) window->pixelBuffer = NULL; } -THUMB_FUNC void WindowArray_Delete(struct Window *windows, int count) +void WindowArray_Delete(struct Window *windows, int count) { for (u16 i = 0; i < count; i++) { @@ -1994,7 +1994,7 @@ THUMB_FUNC void WindowArray_Delete(struct Window *windows, int count) FreeToHeap(windows); } -THUMB_FUNC void CopyWindowToVram(struct Window *window) +void CopyWindowToVram(struct Window *window) { GF_ASSERT(window != NULL); @@ -2005,7 +2005,7 @@ THUMB_FUNC void CopyWindowToVram(struct Window *window) sCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void ScheduleWindowCopyToVram(struct Window *window) +void ScheduleWindowCopyToVram(struct Window *window) { GF_ASSERT(window); @@ -2016,12 +2016,12 @@ THUMB_FUNC void ScheduleWindowCopyToVram(struct Window *window) sScheduleWindowCopyToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void PutWindowTilemap(struct Window *window) +void PutWindowTilemap(struct Window *window) { sPutWindowTilemapFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 width, u8 height) +void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 width, u8 height) { u8 widthBak = window->width; u8 heightBak = window->height; @@ -2034,12 +2034,12 @@ THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 wi window->height = heightBak; } -THUMB_FUNC void ClearWindowTilemap(struct Window *window) +void ClearWindowTilemap(struct Window *window) { sClearWindowTilemapFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void PutWindowTilemap_TextMode(struct Window *param0) +void PutWindowTilemap_TextMode(struct Window *param0) { u32 i, j; u32 r3; @@ -2067,7 +2067,7 @@ THUMB_FUNC void PutWindowTilemap_TextMode(struct Window *param0) } } -THUMB_FUNC void PutWindowTilemap_AffineMode(struct Window *window) +void PutWindowTilemap_AffineMode(struct Window *window) { int j, i; u8 *dst; @@ -2096,7 +2096,7 @@ THUMB_FUNC void PutWindowTilemap_AffineMode(struct Window *window) } } -THUMB_FUNC void ClearWindowTilemapText(struct Window *window) +void ClearWindowTilemapText(struct Window *window) { u32 i, j; @@ -2125,7 +2125,7 @@ THUMB_FUNC void ClearWindowTilemapText(struct Window *window) } } -THUMB_FUNC void ClearWindowTilemapAffine(struct Window *window) +void ClearWindowTilemapAffine(struct Window *window) { int j, i; @@ -2151,7 +2151,7 @@ THUMB_FUNC void ClearWindowTilemapAffine(struct Window *window) } } -THUMB_FUNC void CopyWindowToVram_TextMode(struct Window *window) +void CopyWindowToVram_TextMode(struct Window *window) { PutWindowTilemap_TextMode(window); CopyWindowPixelsToVram_TextMode(window); @@ -2162,14 +2162,14 @@ THUMB_FUNC void CopyWindowToVram_TextMode(struct Window *window) window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void ScheduleWindowCopyToVram_TextMode(struct Window *window) +void ScheduleWindowCopyToVram_TextMode(struct Window *window) { PutWindowTilemap_TextMode(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); CopyWindowPixelsToVram_TextMode(window); } -THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) +void CopyWindowToVram_AffineMode(struct Window *window) { PutWindowTilemap_AffineMode(window); BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, @@ -2185,7 +2185,7 @@ THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) window->baseTile); } -THUMB_FUNC void ScheduleWindowCopyToVram_AffineMode(struct Window *window) +void ScheduleWindowCopyToVram_AffineMode(struct Window *window) { PutWindowTilemap_AffineMode(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); @@ -2196,7 +2196,7 @@ THUMB_FUNC void ScheduleWindowCopyToVram_AffineMode(struct Window *window) window->baseTile); } -THUMB_FUNC void CopyWindowPixelsToVram_TextMode(struct Window *window) +void CopyWindowPixelsToVram_TextMode(struct Window *window) { BG_LoadCharTilesData(window->bgConfig, window->bgId, @@ -2205,17 +2205,17 @@ THUMB_FUNC void CopyWindowPixelsToVram_TextMode(struct Window *window) window->baseTile); } -THUMB_FUNC void ClearWindowTilemapAndCopyToVram(struct Window *window) +void ClearWindowTilemapAndCopyToVram(struct Window *window) { sClearWindowTilemapAndCopyToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer(struct Window *window) +void ClearWindowTilemapAndScheduleTransfer(struct Window *window) { sClearWindowTilemapAndScheduleTransferFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void ClearWindowTilemapAndCopyToVram_TextMode(struct Window *window) +void ClearWindowTilemapAndCopyToVram_TextMode(struct Window *window) { ClearWindowTilemapText(window); BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, @@ -2225,13 +2225,13 @@ THUMB_FUNC void ClearWindowTilemapAndCopyToVram_TextMode(struct Window *window) window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer_TextMode(struct Window *window) +void ClearWindowTilemapAndScheduleTransfer_TextMode(struct Window *window) { ClearWindowTilemapText(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); } -THUMB_FUNC void ClearWindowTilemapAndCopyToVram_AffineMode(struct Window *window) +void ClearWindowTilemapAndCopyToVram_AffineMode(struct Window *window) { ClearWindowTilemapAffine(window); BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, @@ -2241,13 +2241,13 @@ THUMB_FUNC void ClearWindowTilemapAndCopyToVram_AffineMode(struct Window *window window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer_AffineMode(struct Window *window) +void ClearWindowTilemapAndScheduleTransfer_AffineMode(struct Window *window) { ClearWindowTilemapAffine(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); } -THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) +void FillWindowPixelBuffer(struct Window *window, u8 param1) { if (window->bgConfig->bgs[window->bgId].tileSize == 0x20) { @@ -2260,7 +2260,7 @@ THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) (u32)(window->bgConfig->bgs[window->bgId].tileSize * window->width * window->height)); } -THUMB_FUNC void BlitBitmapRectToWindow(struct Window *window, +void BlitBitmapRectToWindow(struct Window *window, const void *src, u16 srcX, u16 srcY, @@ -2275,7 +2275,7 @@ THUMB_FUNC void BlitBitmapRectToWindow(struct Window *window, window, src, srcX, srcY, srcWidth, srcHeight, dstX, dstY, dstWidth, dstHeight, 0); } -THUMB_FUNC void BlitBitmapRect(struct Window *window, +void BlitBitmapRect(struct Window *window, void *param1, u16 param2, u16 param3, @@ -2302,7 +2302,7 @@ THUMB_FUNC void BlitBitmapRect(struct Window *window, } } -THUMB_FUNC void FillWindowPixelRect( +void FillWindowPixelRect( struct Window *window, u8 fillValue, u16 x, u16 y, u16 width, u16 height) { struct Bitmap st8 = { @@ -2411,7 +2411,7 @@ THUMB_FUNC void FillWindowPixelRect( } \ } -THUMB_FUNC void CopyGlyphToWindow(struct Window *window, u8 *glyphPixels, u16 srcWidth, u16 srcHeight, u16 dstX, u16 dstY, u16 table) +void CopyGlyphToWindow(struct Window *window, u8 *glyphPixels, u16 srcWidth, u16 srcHeight, u16 dstX, u16 dstY, u16 table) { u8 *windowPixels; u16 destWidth, destHeight; @@ -2496,7 +2496,7 @@ THUMB_FUNC void CopyGlyphToWindow(struct Window *window, u8 *glyphPixels, u16 sr } } -THUMB_FUNC void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 param3) +void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 param3) { if (window->bgConfig->bgs[window->bgId].colorMode == GX_BG_COLORMODE_16) { @@ -2508,7 +2508,7 @@ THUMB_FUNC void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 pa } } -THUMB_FUNC void ScrollWindow4bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) +void ScrollWindow4bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) { void *r2; int r5, r1, r3; @@ -2576,7 +2576,7 @@ THUMB_FUNC void ScrollWindow4bpp(struct Window *window, u32 param1, u8 param2, u } } -THUMB_FUNC void ScrollWindow8bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) +void ScrollWindow8bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) { void *pixelBuffer; @@ -2667,41 +2667,41 @@ THUMB_FUNC void ScrollWindow8bpp(struct Window *window, u32 param1, u8 param2, u } } -THUMB_FUNC u8 GetWindowBgId(struct Window *window) +u8 GetWindowBgId(struct Window *window) { return window->bgId; } -THUMB_FUNC u8 GetWindowWidth(struct Window *window) +u8 GetWindowWidth(struct Window *window) { return window->width; } -THUMB_FUNC u8 GetWindowHeight(struct Window *window) +u8 GetWindowHeight(struct Window *window) { return window->height; } -THUMB_FUNC u8 GetWindowX(struct Window *window) +u8 GetWindowX(struct Window *window) { return window->tilemapLeft; } -THUMB_FUNC u8 GetWindowY(struct Window *window) +u8 GetWindowY(struct Window *window) { return window->tilemapTop; } -THUMB_FUNC void MoveWindowX(struct Window *window, u8 x) +void MoveWindowX(struct Window *window, u8 x) { window->tilemapLeft = x; } -THUMB_FUNC void MoveWindowY(struct Window *window, u8 y) +void MoveWindowY(struct Window *window, u8 y) { window->tilemapTop = y; } -THUMB_FUNC void SetWindowPaletteNum(struct Window *window, u8 paletteNum) +void SetWindowPaletteNum(struct Window *window, u8 paletteNum) { window->paletteNum = paletteNum; } -THUMB_FUNC NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, const char *path) +NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); *char_ret = ptr; @@ -2711,7 +2711,7 @@ THUMB_FUNC NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 return st0; } -THUMB_FUNC NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap_id, const char *path) +NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); *pltt_ret = ptr; @@ -2721,7 +2721,7 @@ THUMB_FUNC NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap return st0; } -THUMB_FUNC void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig) +void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig) { ApplyScheduledBgPosUpdate(bgConfig); DoScheduledBgTilemapBufferTransfers(bgConfig); @@ -2730,7 +2730,7 @@ THUMB_FUNC void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig) bgConfig->bufferTransferScheduled = 0; } -THUMB_FUNC void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig) +void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig) { if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_MAIN_0)) != 0) { @@ -2773,12 +2773,12 @@ THUMB_FUNC void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig) } } -THUMB_FUNC void ScheduleBgTilemapBufferTransfer(struct BgConfig *bgConfig, u32 bgId) +void ScheduleBgTilemapBufferTransfer(struct BgConfig *bgConfig, u32 bgId) { bgConfig->bufferTransferScheduled |= 1 << bgId; } -THUMB_FUNC void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig) +void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig) { if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_MAIN_0)) != 0) { @@ -2881,21 +2881,21 @@ THUMB_FUNC void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig) } } -THUMB_FUNC void ScheduleSetBgPosText( +void ScheduleSetBgPosText( struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value) { Bg_SetPosText(&bgConfig->bgs[bgId], op, value); bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void ScheduleSetBgAffineRotation( +void ScheduleSetBgAffineRotation( struct BgConfig *bgConfig, u32 bgId, u32 op, u16 value) { Bg_SetAffineRotation(&bgConfig->bgs[bgId], op, value); bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val) +void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val) { switch (op) { @@ -2911,14 +2911,14 @@ THUMB_FUNC void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val) } } -THUMB_FUNC void ScheduleSetBgAffinePos( +void ScheduleSetBgAffinePos( struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value) { Bg_SetAffinePos(&bgConfig->bgs[bgId], op, value); bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val) +void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val) { switch (op) { @@ -2943,7 +2943,7 @@ THUMB_FUNC void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val) } } -THUMB_FUNC u32 DoesPixelAtScreenXYMatchPtrVal( +u32 DoesPixelAtScreenXYMatchPtrVal( struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 *src) { void *bgCharPtr; @@ -3021,7 +3021,7 @@ THUMB_FUNC u32 DoesPixelAtScreenXYMatchPtrVal( return 0; } -THUMB_FUNC void ApplyFlipFlagsToTile(struct BgConfig *bgConfig, u8 flag, u8 *src) +void ApplyFlipFlagsToTile(struct BgConfig *bgConfig, u8 flag, u8 *src) { u8 i, j; if (flag != 0) diff --git a/arm9/src/brightness.c b/arm9/src/brightness.c index fab2bb84f..fb9cc70ec 100644 --- a/arm9/src/brightness.c +++ b/arm9/src/brightness.c @@ -7,7 +7,7 @@ struct BrightnessData mainScreenBrightnessData; struct BrightnessData subScreenBrightnessData; -THUMB_FUNC void DoBrightnessTransitionStep(struct BrightnessData *brightness) +void DoBrightnessTransitionStep(struct BrightnessData *brightness) { BOOL transitionFinished = FALSE; @@ -56,7 +56,7 @@ THUMB_FUNC void DoBrightnessTransitionStep(struct BrightnessData *brightness) } } -THUMB_FUNC void InitBrightnessTransition(struct BrightnessData *brightnessData, +void InitBrightnessTransition(struct BrightnessData *brightnessData, u16 step_count, s16 target_brightness, s16 start_brightness, @@ -88,7 +88,7 @@ THUMB_FUNC void InitBrightnessTransition(struct BrightnessData *brightnessData, brightnessData->fractional_count = 0; } -THUMB_FUNC void StartBrightnessTransition( +void StartBrightnessTransition( u16 step_count, s16 target_brightness, s16 start_brightness, fx32 surfaceMask, u32 screenMask) { if (step_count != 0) @@ -117,7 +117,7 @@ THUMB_FUNC void StartBrightnessTransition( } } -THUMB_FUNC void SetBlendBrightness(fx32 brightness, fx32 surfaceMask, u32 screenMask) +void SetBlendBrightness(fx32 brightness, fx32 surfaceMask, u32 screenMask) { if ((screenMask & 1) != 0) @@ -133,7 +133,7 @@ THUMB_FUNC void SetBlendBrightness(fx32 brightness, fx32 surfaceMask, u32 screen InitScreenBrightnessData(screenMask); } -THUMB_FUNC void InitAllScreenBrightnessData(void) +void InitAllScreenBrightnessData(void) { MI_CpuFill8(&mainScreenBrightnessData, 0, sizeof(struct BrightnessData)); MI_CpuFill8(&subScreenBrightnessData, 0, sizeof(struct BrightnessData)); @@ -142,7 +142,7 @@ THUMB_FUNC void InitAllScreenBrightnessData(void) subScreenBrightnessData.transitionActive = FALSE; } -THUMB_FUNC void InitScreenBrightnessData(u32 screenMask) +void InitScreenBrightnessData(u32 screenMask) { if (screenMask & 1) { @@ -157,7 +157,7 @@ THUMB_FUNC void InitScreenBrightnessData(u32 screenMask) } } -THUMB_FUNC void DoAllScreenBrightnessTransitionStep(void) +void DoAllScreenBrightnessTransitionStep(void) { if (mainScreenBrightnessData.transitionActive) { @@ -170,7 +170,7 @@ THUMB_FUNC void DoAllScreenBrightnessTransitionStep(void) } } -THUMB_FUNC BOOL IsBrightnessTransitionActive(u32 screenMask) +BOOL IsBrightnessTransitionActive(u32 screenMask) { if (screenMask == 3) { diff --git a/arm9/src/camera.c b/arm9/src/camera.c index a8631a194..7cc747be2 100644 --- a/arm9/src/camera.c +++ b/arm9/src/camera.c @@ -13,7 +13,7 @@ static struct Camera * sCameraPtr; void Camera_OffsetLookAtPosAndTarget(const VecFx32 *delta, struct Camera * camera); void Camera_ApplyPerspectiveType(u8 perspectiveType, struct Camera * camera); -THUMB_FUNC void Camera_CalcLookAtPosFromTargetAndAngle(struct Camera * camera) +void Camera_CalcLookAtPosFromTargetAndAngle(struct Camera * camera) { u16 negx = -camera->angle.x; camera->lookAt.camPos.x = FX_Mul(FX_Mul(FX_SinIdx(camera->angle.y), camera->distance), FX_CosIdx(camera->angle.x)); @@ -22,7 +22,7 @@ THUMB_FUNC void Camera_CalcLookAtPosFromTargetAndAngle(struct Camera * camera) VEC_Add(&camera->lookAt.camPos, &camera->lookAt.camTarget, &camera->lookAt.camPos); } -THUMB_FUNC void Camera_CalcLookAtTargetFromPosAndAngle(struct Camera * camera) +void Camera_CalcLookAtTargetFromPosAndAngle(struct Camera * camera) { u16 negx = -camera->angle.x; camera->lookAt.camTarget.x = -FX_Mul(FX_Mul(FX_SinIdx(camera->angle.y), camera->distance), FX_CosIdx(camera->angle.x)); @@ -31,7 +31,7 @@ THUMB_FUNC void Camera_CalcLookAtTargetFromPosAndAngle(struct Camera * camera) VEC_Add(&camera->lookAt.camTarget, &camera->lookAt.camPos, &camera->lookAt.camTarget); } -THUMB_FUNC void Camera_InitInternal(u16 perspectiveAngle, struct Camera * camera) +void Camera_InitInternal(u16 perspectiveAngle, struct Camera * camera) { camera->perspectiveAngle = perspectiveAngle; camera->perspective.fovySin = FX_SinIdx(perspectiveAngle); @@ -49,7 +49,7 @@ THUMB_FUNC void Camera_InitInternal(u16 perspectiveAngle, struct Camera * camera camera->history = NULL; } -THUMB_FUNC void Camera_VecResetCoordsIfOffsetComponentNotEnabled(struct Camera * camera, VecFx32 * vec) +void Camera_VecResetCoordsIfOffsetComponentNotEnabled(struct Camera * camera, VecFx32 * vec) { if (!camera->enableOffsetX) vec->x = 0; @@ -59,7 +59,7 @@ THUMB_FUNC void Camera_VecResetCoordsIfOffsetComponentNotEnabled(struct Camera * vec->z = 0; } -THUMB_FUNC void Camera_GetVecFromSomeRingBufferMaybe(struct Camera * camera, const VecFx32 * vecDefault, VecFx32 * vecDst) +void Camera_GetVecFromSomeRingBufferMaybe(struct Camera * camera, const VecFx32 * vecDefault, VecFx32 * vecDst) { s32 * idx_p; s32 * idx2_p; @@ -93,7 +93,7 @@ THUMB_FUNC void Camera_GetVecFromSomeRingBufferMaybe(struct Camera * camera, con } } -THUMB_FUNC void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, s32 heap_id, struct Camera * camera) +void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEnableFlags, s32 heap_id, struct Camera * camera) { s32 i; struct CameraHistory * history; @@ -127,7 +127,7 @@ THUMB_FUNC void Camera_AllocHistory(s32 count, s32 initialWriteIdx, s32 updateEn } } -THUMB_FUNC void Camera_FreeHistory(struct Camera * camera) +void Camera_FreeHistory(struct Camera * camera) { if (camera->history != NULL) { @@ -137,32 +137,32 @@ THUMB_FUNC void Camera_FreeHistory(struct Camera * camera) } } -THUMB_FUNC struct Camera * Camera_Alloc(u32 heap_id) +struct Camera * Camera_Alloc(u32 heap_id) { return AllocFromHeap(heap_id, sizeof(struct Camera)); } -THUMB_FUNC void Camera_Free(struct Camera * camera) +void Camera_Free(struct Camera * camera) { FreeToHeap(camera); } -THUMB_FUNC void Camera_Copy(struct Camera * src, struct Camera * dest) +void Camera_Copy(struct Camera * src, struct Camera * dest) { *dest = *src; } -THUMB_FUNC void Camera_SetWorkPtr(struct Camera * camera) +void Camera_SetWorkPtr(struct Camera * camera) { sCameraPtr = camera; } -THUMB_FUNC void Camera_UnsetWorkPtr(void) +void Camera_UnsetWorkPtr(void) { sCameraPtr = NULL; } -THUMB_FUNC void Camera_PushLookAtToNNSGlb(void) +void Camera_PushLookAtToNNSGlb(void) { VecFx32 diff; VecFx32 offset; @@ -180,12 +180,12 @@ THUMB_FUNC void Camera_PushLookAtToNNSGlb(void) } } -THUMB_FUNC void Camera_SetLookAtCamUp(VecFx32 * camUp, struct Camera * camera) +void Camera_SetLookAtCamUp(VecFx32 * camUp, struct Camera * camera) { camera->lookAt.camUp = *camUp; } -THUMB_FUNC void Camera_SetFixedTarget(VecFx32 * target, struct Camera * camera) +void Camera_SetFixedTarget(VecFx32 * target, struct Camera * camera) { camera->currTarget_p = target; camera->lastTarget = *target; @@ -194,7 +194,7 @@ THUMB_FUNC void Camera_SetFixedTarget(VecFx32 * target, struct Camera * camera) camera->enableOffsetZ = TRUE; } -THUMB_FUNC void Camera_ClearFixedTarget(struct Camera * camera) +void Camera_ClearFixedTarget(struct Camera * camera) { camera->currTarget_p = NULL; camera->enableOffsetX = FALSE; @@ -202,14 +202,14 @@ THUMB_FUNC void Camera_ClearFixedTarget(struct Camera * camera) camera->enableOffsetZ = FALSE; } -THUMB_FUNC void Camera_SetPerspectiveClippingPlane(s32 n, s32 f, struct Camera * camera) +void Camera_SetPerspectiveClippingPlane(s32 n, s32 f, struct Camera * camera) { camera->perspective.near = n; camera->perspective.far = f, Camera_ApplyPerspectiveType(camera->perspectiveType, camera); } -THUMB_FUNC void Camera_InitWithTargetAndAngle(VecFx32 * target, fx32 distance, struct CameraAngle * angle, u16 perspectiveAngle, u8 perspectiveType, BOOL fixReference, struct Camera * camera) +void Camera_InitWithTargetAndAngle(VecFx32 * target, fx32 distance, struct CameraAngle * angle, u16 perspectiveAngle, u8 perspectiveType, BOOL fixReference, struct Camera * camera) { Camera_InitInternal(perspectiveAngle, camera); camera->lookAt.camTarget = *target; @@ -227,7 +227,7 @@ THUMB_FUNC void Camera_InitWithTargetAndAngle(VecFx32 * target, fx32 distance, s } } -THUMB_FUNC void Camera_InitWithPosAndAngle(VecFx32 * pos, fx32 distance, struct CameraAngle * angle, u16 perspectiveAngle, u8 sp18, struct Camera * camera) +void Camera_InitWithPosAndAngle(VecFx32 * pos, fx32 distance, struct CameraAngle * angle, u16 perspectiveAngle, u8 sp18, struct Camera * camera) { Camera_InitInternal(perspectiveAngle, camera); camera->lookAt.camPos = *pos; @@ -237,7 +237,7 @@ THUMB_FUNC void Camera_InitWithPosAndAngle(VecFx32 * pos, fx32 distance, struct Camera_ApplyPerspectiveType(sp18, camera); } -THUMB_FUNC void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32 *pos, u16 perspectiveAngle, u8 perspectiveType, BOOL setReference, struct Camera * camera) +void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32 *pos, u16 perspectiveAngle, u8 perspectiveType, BOOL setReference, struct Camera * camera) { VecFx32 vec_from_pos_to_target; Camera_InitInternal(perspectiveAngle, camera); @@ -282,7 +282,7 @@ THUMB_FUNC void Camera_InitWithPosAndTarget(const VecFx32 *target, const VecFx32 } } -THUMB_FUNC void Camera_ApplyPerspectiveType(u8 perspectiveType, struct Camera * camera) +void Camera_ApplyPerspectiveType(u8 perspectiveType, struct Camera * camera) { if (perspectiveType == 0) { @@ -300,7 +300,7 @@ THUMB_FUNC void Camera_ApplyPerspectiveType(u8 perspectiveType, struct Camera * } } -THUMB_FUNC void Camera_SetPerspectiveAngle(u16 perspectiveAngle, struct Camera * camera) +void Camera_SetPerspectiveAngle(u16 perspectiveAngle, struct Camera * camera) { camera->perspectiveAngle = perspectiveAngle; camera->perspective.fovySin = FX_SinIdx(camera->perspectiveAngle); @@ -308,7 +308,7 @@ THUMB_FUNC void Camera_SetPerspectiveAngle(u16 perspectiveAngle, struct Camera * Camera_ApplyPerspectiveType(camera->perspectiveType, camera); } -THUMB_FUNC void Camera_AdjustPerspectiveAngle(u16 rotation, struct Camera * camera) +void Camera_AdjustPerspectiveAngle(u16 rotation, struct Camera * camera) { camera->perspectiveAngle += rotation; camera->perspective.fovySin = FX_SinIdx(camera->perspectiveAngle); @@ -316,19 +316,19 @@ THUMB_FUNC void Camera_AdjustPerspectiveAngle(u16 rotation, struct Camera * came Camera_ApplyPerspectiveType(camera->perspectiveType, camera); } -THUMB_FUNC void Camera_OffsetLookAtPosAndTarget(const VecFx32 *delta, struct Camera * camera) +void Camera_OffsetLookAtPosAndTarget(const VecFx32 *delta, struct Camera * camera) { VEC_Add(&camera->lookAt.camPos, delta, &camera->lookAt.camPos); VEC_Add(&camera->lookAt.camTarget, delta, &camera->lookAt.camTarget); } -THUMB_FUNC void Camera_SetAngle(const struct CameraAngle * angle, struct Camera * camera) +void Camera_SetAngle(const struct CameraAngle * angle, struct Camera * camera) { camera->angle = *angle; Camera_CalcLookAtPosFromTargetAndAngle(camera); } -THUMB_FUNC void Camera_AdjustAngle(const struct CameraAngle * delta, struct Camera * camera) +void Camera_AdjustAngle(const struct CameraAngle * delta, struct Camera * camera) { camera->angle.x += delta->x; camera->angle.y += delta->y; @@ -336,48 +336,48 @@ THUMB_FUNC void Camera_AdjustAngle(const struct CameraAngle * delta, struct Came Camera_CalcLookAtTargetFromPosAndAngle(camera); } -THUMB_FUNC void Camera_SetDistance(fx32 distance, struct Camera * camera) +void Camera_SetDistance(fx32 distance, struct Camera * camera) { camera->distance = distance; Camera_CalcLookAtPosFromTargetAndAngle(camera); } -THUMB_FUNC void Camera_SetLookAtTargetAndRecalcPos(const VecFx32 * target, struct Camera * camera) +void Camera_SetLookAtTargetAndRecalcPos(const VecFx32 * target, struct Camera * camera) { camera->lookAt.camTarget = *target; Camera_CalcLookAtPosFromTargetAndAngle(camera); } -THUMB_FUNC u16 Camera_GetPerspectiveAngle(struct Camera * camera) +u16 Camera_GetPerspectiveAngle(struct Camera * camera) { return camera->perspectiveAngle; } -THUMB_FUNC fx32 Camera_GetDistance(struct Camera * camera) +fx32 Camera_GetDistance(struct Camera * camera) { return camera->distance; } -THUMB_FUNC void Camera_GetAngle(struct CameraAngle * dest, struct Camera * camera) +void Camera_GetAngle(struct CameraAngle * dest, struct Camera * camera) { *dest = camera->angle; } -THUMB_FUNC void Camera_GetLookAtCamTarget(VecFx32 * dest, const struct Camera * camera) +void Camera_GetLookAtCamTarget(VecFx32 * dest, const struct Camera * camera) { *dest = camera->lookAt.camTarget; } -THUMB_FUNC void Camera_GetLookAtCamPos(VecFx32 * dest, const struct Camera * camera) +void Camera_GetLookAtCamPos(VecFx32 * dest, const struct Camera * camera) { *dest = camera->lookAt.camPos; } -THUMB_FUNC void Camera_SetLookAtCamTarget(const VecFx32 * target, struct Camera * camera) +void Camera_SetLookAtCamTarget(const VecFx32 * target, struct Camera * camera) { camera->lookAt.camTarget = *target; } -THUMB_FUNC void Camera_SetLookAtCamPos(const VecFx32 * pos, struct Camera * camera) +void Camera_SetLookAtCamPos(const VecFx32 * pos, struct Camera * camera) { camera->lookAt.camPos = *pos; } diff --git a/arm9/src/coins.c b/arm9/src/coins.c index 80efb7681..7c5aeb558 100644 --- a/arm9/src/coins.c +++ b/arm9/src/coins.c @@ -1,8 +1,6 @@ #include "global.h" #include "coins.h" -#pragma thumb on - void InitCoins(u16 * coins) { *coins = 0; diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c index 8480d8fab..5a458ed5f 100644 --- a/arm9/src/communication_error.c +++ b/arm9/src/communication_error.c @@ -61,13 +61,13 @@ static const struct GraphicsBanks sCommunicationErrorGraphicsBanks = { static void VBlankIntr(void); -THUMB_FUNC static void VBlankIntr(void) +static void VBlankIntr(void) { DTCM.intr_check |= OS_IE_V_BLANK; MI_WaitDma(GX_DEFAULT_DMAID); } -THUMB_FUNC void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) +void ShowCommunicationError(u32 heap_id, u32 error, u32 error_code) { struct Window window; diff --git a/arm9/src/daycare.c b/arm9/src/daycare.c index 95eed6d74..34b3e0944 100644 --- a/arm9/src/daycare.c +++ b/arm9/src/daycare.c @@ -4,8 +4,6 @@ #include "save_block_2.h" #include "daycare.h" -#pragma thumb on - u32 Save_DayCare_sizeof(void) { return sizeof(struct DayCare); diff --git a/arm9/src/error_handling.c b/arm9/src/error_handling.c index 0b76ccff4..f9bc5a2d4 100644 --- a/arm9/src/error_handling.c +++ b/arm9/src/error_handling.c @@ -5,7 +5,7 @@ -THUMB_FUNC void GF_AssertFail(void) +void GF_AssertFail(void) { if (FUN_02031810()) { diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index e7c4070cf..e8564ad2e 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -1,3 +1,4 @@ +#include "global.h" #include "error_message_reset.h" #include "GX_layers.h" #include "gx.h" @@ -66,13 +67,13 @@ static u32 sErrorMessagePrinterLock; extern void FUN_0200E3A0(PMLCDTarget, int); extern void SetMasterBrightnessNeutral(u32 screen); -THUMB_FUNC void VBlankHandler() +void VBlankHandler() { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); } -THUMB_FUNC void PrintErrorMessageAndReset() +void PrintErrorMessageAndReset() { struct BgConfig *ptr; diff --git a/arm9/src/event_data.c b/arm9/src/event_data.c index 6845fd231..c7a990754 100644 --- a/arm9/src/event_data.c +++ b/arm9/src/event_data.c @@ -2,8 +2,6 @@ #include "save_block_2.h" #include "event_data.h" -#pragma thumb on - u8 UNK_021C5A14[8]; u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id); diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c index 0950ce278..ad462c2e1 100644 --- a/arm9/src/filesystem.c +++ b/arm9/src/filesystem.c @@ -156,7 +156,7 @@ static char * sNarcFileList[] = { "poketool/shinzukan.narc", }; -THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size) +void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size) { FSFile file; register u32 chunk_starts[3]; @@ -194,7 +194,7 @@ THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s3 FS_CloseFile(&file); } -THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4) +void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4) { FSFile file; register u32 chunk_starts[3]; @@ -243,37 +243,37 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f return dest; } -THUMB_FUNC void ReadWholeNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id) +void ReadWholeNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id) { ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, 0, 0); } -THUMB_FUNC void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id) +void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id) { return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, FALSE); } -THUMB_FUNC void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id) +void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id) { return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, TRUE); } -THUMB_FUNC void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size) +void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size) { ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, offset, size); } -THUMB_FUNC void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size) +void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size) { return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, FALSE); } -THUMB_FUNC void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size) +void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size) { return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, TRUE); } -THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) +u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) { FSFile file; register u32 chunk_starts[3]; @@ -308,7 +308,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) return chunk_size; } -THUMB_FUNC NARC * NARC_New(NarcId narc_id, u32 heap_id) +NARC * NARC_New(NarcId narc_id, u32 heap_id) { NARC * narc = (NARC *)AllocFromHeap(heap_id, sizeof(NARC)); u32 btnf_start; @@ -331,13 +331,13 @@ THUMB_FUNC NARC * NARC_New(NarcId narc_id, u32 heap_id) return narc; } -THUMB_FUNC void NARC_Delete(NARC * narc) +void NARC_Delete(NARC * narc) { FS_CloseFile(&narc->file); FreeToHeap(narc); // free to heap } -THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id) +void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id) { u32 file_start; u32 file_end; @@ -355,7 +355,7 @@ THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 hea return dest; } -THUMB_FUNC void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest) +void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest) { u32 file_start; u32 file_end; @@ -367,7 +367,7 @@ THUMB_FUNC void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest) FS_ReadFile(&narc->file, dest, (s32)(file_end - file_start)); } -THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id) +u32 NARC_GetMemberSize(NARC * narc, u32 file_id) { u32 file_start; u32 file_end; @@ -378,7 +378,7 @@ THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id) return file_end - file_start; } -THUMB_FUNC void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest) +void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest) { u32 file_start; GF_ASSERT(narc->num_files > file_id); @@ -388,12 +388,12 @@ THUMB_FUNC void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, FS_ReadFile(&narc->file, dest, (s32)size); } -THUMB_FUNC void NARC_ReadFile(NARC * narc, u32 size, void * dest) +void NARC_ReadFile(NARC * narc, u32 size, void * dest) { FS_ReadFile(&narc->file, dest, (s32)size); } -THUMB_FUNC u16 NARC_GetFileCount(NARC * narc) +u16 NARC_GetFileCount(NARC * narc) { return narc->num_files; } diff --git a/arm9/src/font.c b/arm9/src/font.c index 11c909ad7..5bfda6a57 100644 --- a/arm9/src/font.c +++ b/arm9/src/font.c @@ -27,7 +27,7 @@ const struct FontInfo gFontInfos[5] = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; -THUMB_FUNC void FUN_02002C14() +void FUN_02002C14() { UNK_02106FC8 = &UNK_02106FCC; @@ -40,13 +40,13 @@ THUMB_FUNC void FUN_02002C14() SetFontsPointer(&gFontInfos[0]); } -THUMB_FUNC void FUN_02002C50(u32 font_id, u32 heap_id) +void FUN_02002C50(u32 font_id, u32 heap_id) { UNK_02106FC8->unk94[font_id] = FontData_New(NARC_GRAPHIC_FONT, UNK_020ECB54[font_id][0], 1, UNK_020ECB54[font_id][1], heap_id); } -THUMB_FUNC void FUN_02002C84(s32 param0, u32 param1) +void FUN_02002C84(s32 param0, u32 param1) { GF_ASSERT(param0 < 4); GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); @@ -54,7 +54,7 @@ THUMB_FUNC void FUN_02002C84(s32 param0, u32 param1) FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 0, param1); } -THUMB_FUNC void FUN_02002CC0(s32 param0) +void FUN_02002CC0(s32 param0) { GF_ASSERT(param0 < 4); GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); @@ -62,7 +62,7 @@ THUMB_FUNC void FUN_02002CC0(s32 param0) FontData_ModeSwitch(UNK_02106FC8->unk94[param0], 1, 0); } -THUMB_FUNC void FUN_02002CF8(int param0) +void FUN_02002CF8(int param0) { GF_ASSERT(param0 < 4); @@ -94,14 +94,14 @@ THUMB_FUNC void FUN_02002CF8(int param0) } } -THUMB_FUNC struct UnkStruct_02002C14_sub *FUN_02002D94(u32 param0, u32 param1) +struct UnkStruct_02002C14_sub *FUN_02002D94(u32 param0, u32 param1) { TryLoadGlyph(UNK_02106FC8->unk94[param0], param1, &UNK_02106FC8->unk00); return &UNK_02106FC8->unk00; } -THUMB_FUNC u32 FontFunc(u32 fontId, struct TextPrinter *printer) +u32 FontFunc(u32 fontId, struct TextPrinter *printer) { struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&printer->subStructFields); @@ -115,21 +115,21 @@ THUMB_FUNC u32 FontFunc(u32 fontId, struct TextPrinter *printer) return RenderText(printer); } -THUMB_FUNC u32 FUN_02002DE0(u32 param0, u16 *str, u32 param2) +u32 FUN_02002DE0(u32 param0, u16 *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); return GetStringWidth(UNK_02106FC8->unk94[param0], str, param2); } -THUMB_FUNC u32 FUN_02002E14(u32 param0, struct String *str, u32 param2) +u32 FUN_02002E14(u32 param0, struct String *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); return GetStringWidth(UNK_02106FC8->unk94[param0], String_c_str(str), param2); } -THUMB_FUNC s32 GetFontAttribute(u8 fontId, s32 attr) +s32 GetFontAttribute(u8 fontId, s32 attr) { u8 ret = 0; switch (attr) @@ -163,25 +163,25 @@ THUMB_FUNC s32 GetFontAttribute(u8 fontId, s32 attr) return ret; } -THUMB_FUNC void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heap_id) +void LoadFontPal0(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heap_id) { GfGfxLoader_GXLoadPal(NARC_GRAPHIC_FONT, NARC_font_narc_0006_NCLR, location, palSlotOffset, 0x20, heap_id); } -THUMB_FUNC void FUN_02002EEC(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heap_id) +void FUN_02002EEC(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 heap_id) { GfGfxLoader_GXLoadPal( NARC_GRAPHIC_FONT, NARC_font_narc_0007_NCLR, location, palSlotOffset, 0x20, heap_id); } -THUMB_FUNC s32 FUN_02002F08(u32 param0, struct String *str, u32 param2) +s32 FUN_02002F08(u32 param0, struct String *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); return GetStringWidthMultiline(UNK_02106FC8->unk94[param0], String_c_str(str), param2); } -THUMB_FUNC u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3) +u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3) { u32 r0 = FUN_02002E14(param0, str, param2); if (r0 < param3) @@ -192,7 +192,7 @@ THUMB_FUNC u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 para return 0; } -THUMB_FUNC u32 FUN_02002F58(const u16 *str) +u32 FUN_02002F58(const u16 *str) { u32 r5 = 1; while (*str != EOS) @@ -216,12 +216,12 @@ THUMB_FUNC u32 FUN_02002F58(const u16 *str) return r5; } -THUMB_FUNC u32 FUN_02002F90(struct String *str) +u32 FUN_02002F90(struct String *str) { return FUN_02002F58(String_c_str(str)); } -THUMB_FUNC s32 FUN_02002F9C(u32 param0, struct String *str) +s32 FUN_02002F9C(u32 param0, struct String *str) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index 7e38c0510..68791a50b 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -13,8 +13,6 @@ #include "heap.h" #include "OS_interrupt.h" -#pragma thumb on - static struct { void * contents; u32 name_hash; diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index 2e42f0a8a..a6d58a63c 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -3,7 +3,7 @@ #include "NNS_g2d.h" #include "gf_gfx_loader.h" -THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, u32 heap_id) +u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 numTiles, u32 szByte, BOOL isCompressed, u32 heap_id) { NNSG2dCharacterData * pCharData; void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE); @@ -20,7 +20,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgCo return szByte; } -THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, u32 heap_id) +void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 layer, u32 tileOffset, u32 szByte, BOOL isCompressed, u32 heap_id) { NNSG2dScreenData * pScreenData; void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE); @@ -38,12 +38,12 @@ THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgC } } -THUMB_FUNC void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id) +void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id) { GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, location, 0, palSlotOffset, szByte, heap_id); } -THUMB_FUNC void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id) +void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, enum GFPalLoadLocation location, u32 srcOffset, enum GFPalSlotOffset palSlotOffset, u32 szByte, u32 heap_id) { static void (*const load_funcs[])(void *, u32, u32) = { GX_LoadBGPltt, @@ -96,7 +96,7 @@ THUMB_FUNC void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, } } -THUMB_FUNC u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id) +u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 layer, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id) { static void (*const load_funcs[])(void *, u32, u32) = { GX_LoadOBJ, @@ -119,7 +119,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 lay return szByte; } -THUMB_FUNC void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy) +void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, TRUE); NNSG2dPaletteData* pPlttData; @@ -142,7 +142,7 @@ THUMB_FUNC void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NN } } -THUMB_FUNC u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy) +u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy) { static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, @@ -166,7 +166,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL is return retSize; } -THUMB_FUNC void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy) +void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 layer, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy) { static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, @@ -197,7 +197,7 @@ THUMB_FUNC void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 } } -THUMB_FUNC void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id) +void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE); if (pFile != NULL) @@ -211,7 +211,7 @@ THUMB_FUNC void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCo return pFile; } -THUMB_FUNC void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id) +void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE); if (pFile != NULL) @@ -225,7 +225,7 @@ THUMB_FUNC void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCo return pFile; } -THUMB_FUNC void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id) +void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, FALSE); if (pFile != NULL) @@ -239,7 +239,7 @@ THUMB_FUNC void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPal return pFile; } -THUMB_FUNC void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id) +void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE); if (pFile != NULL) @@ -253,7 +253,7 @@ THUMB_FUNC void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCo return pFile; } -THUMB_FUNC void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id) +void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id) { void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE); if (pFile != NULL) @@ -267,12 +267,12 @@ THUMB_FUNC void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCo return pFile; } -THUMB_FUNC void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id) +void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id) { return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heap_id, FALSE); } -THUMB_FUNC void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd) +void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd) { void * dest; void * dest2; @@ -310,7 +310,7 @@ THUMB_FUNC void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isC return dest; } -THUMB_FUNC void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p) +void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p) { void * dest; void * dest2; diff --git a/arm9/src/gf_rtc.c b/arm9/src/gf_rtc.c index 1a6789419..5cc4bdca1 100644 --- a/arm9/src/gf_rtc.c +++ b/arm9/src/gf_rtc.c @@ -21,7 +21,7 @@ GF_RTC_Work sGFRTCWork; void GF_RTC_GetDateTime(GF_RTC_Work * work); -THUMB_FUNC void GF_InitRTCWork(void) +void GF_InitRTCWork(void) { RTC_Init(); __builtin__clear(&sGFRTCWork, sizeof(sGFRTCWork)); @@ -31,7 +31,7 @@ THUMB_FUNC void GF_InitRTCWork(void) GF_RTC_GetDateTime(&sGFRTCWork); } -THUMB_FUNC void GF_RTC_UpdateOnFrame(void) +void GF_RTC_UpdateOnFrame(void) { if (!sGFRTCWork.getDateTimeLock) { @@ -43,7 +43,7 @@ THUMB_FUNC void GF_RTC_UpdateOnFrame(void) } } -THUMB_FUNC void GF_RTC_GetDateTime_Callback(RTCResult result, void * data) +void GF_RTC_GetDateTime_Callback(RTCResult result, void * data) { GF_RTC_Work * work = (GF_RTC_Work *)data; work->getDateTimeErrorCode = result; @@ -54,7 +54,7 @@ THUMB_FUNC void GF_RTC_GetDateTime_Callback(RTCResult result, void * data) work->getDateTimeLock = FALSE; } -THUMB_FUNC void GF_RTC_GetDateTime(GF_RTC_Work * work) +void GF_RTC_GetDateTime(GF_RTC_Work * work) { work->getDateTimeLock = TRUE; RTCResult result = RTC_GetDateTimeAsync(&work->date_async, &work->time_async, GF_RTC_GetDateTime_Callback, work); @@ -62,32 +62,32 @@ THUMB_FUNC void GF_RTC_GetDateTime(GF_RTC_Work * work) GF_ASSERT(result == RTC_RESULT_SUCCESS); } -THUMB_FUNC void GF_RTC_CopyDateTime(RTCDate * date, RTCTime * time) +void GF_RTC_CopyDateTime(RTCDate * date, RTCTime * time) { GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE); *date = sGFRTCWork.date; *time = sGFRTCWork.time; } -THUMB_FUNC void GF_RTC_CopyTime(RTCTime * time) +void GF_RTC_CopyTime(RTCTime * time) { GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE); *time = sGFRTCWork.time; } -THUMB_FUNC void GF_RTC_CopyDate(RTCDate * date) +void GF_RTC_CopyDate(RTCDate * date) { GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE); *date = sGFRTCWork.date; } -THUMB_FUNC s32 GF_RTC_TimeToSec(void) +s32 GF_RTC_TimeToSec(void) { RTCTime* time = &sGFRTCWork.time; return 60 * time->minute + 3600 * time->hour + time->second; } -THUMB_FUNC s64 GF_RTC_DateTimeToSec(void) +s64 GF_RTC_DateTimeToSec(void) { return RTC_ConvertDateTimeToSecond(&sGFRTCWork.date, &sGFRTCWork.time); } @@ -97,7 +97,7 @@ static inline BOOL IsLeapYear(s32 year) return ((year % 4) == 0 && (year % 100) != 0) || ((year % 400) == 0); } -THUMB_FUNC s32 GF_RTC_GetDayOfYear(const RTCDate * date) +s32 GF_RTC_GetDayOfYear(const RTCDate * date) { RTCDate date_stack; s32 days; @@ -128,7 +128,7 @@ THUMB_FUNC s32 GF_RTC_GetDayOfYear(const RTCDate * date) return days; } -THUMB_FUNC BOOL IsNighttime(void) +BOOL IsNighttime(void) { switch (GF_RTC_GetTimeOfDay()) { @@ -140,14 +140,14 @@ THUMB_FUNC BOOL IsNighttime(void) } } -THUMB_FUNC enum RTC_TimeOfDay GF_RTC_GetTimeOfDay(void) +enum RTC_TimeOfDay GF_RTC_GetTimeOfDay(void) { RTCTime time; GF_RTC_CopyTime(&time); return GF_RTC_GetTimeOfDayByHour(time.hour); } -THUMB_FUNC enum RTC_TimeOfDay GF_RTC_GetTimeOfDayByHour(s32 hour) +enum RTC_TimeOfDay GF_RTC_GetTimeOfDayByHour(s32 hour) { static const u8 sTimeOfDayByHour[] = { // 00:00 - 03:59 @@ -166,7 +166,7 @@ THUMB_FUNC enum RTC_TimeOfDay GF_RTC_GetTimeOfDayByHour(s32 hour) return (enum RTC_TimeOfDay)sTimeOfDayByHour[hour]; } -THUMB_FUNC s64 GF_RTC_TimeDelta(s64 first, s64 last) +s64 GF_RTC_TimeDelta(s64 first, s64 last) { RTCDate maxDate = { 99, 12, 31, RTC_WEEK_SUNDAY }; RTCTime maxTime = { 23, 59, 59 }; diff --git a/arm9/src/hall_of_fame.c b/arm9/src/hall_of_fame.c index e00f38053..ae0e6ea49 100644 --- a/arm9/src/hall_of_fame.c +++ b/arm9/src/hall_of_fame.c @@ -7,8 +7,6 @@ #include "RTC_api.h" #include "hall_of_fame.h" -#pragma thumb on - u32 Save_HOF_sizeof(void) { return sizeof(struct HallOfFame); diff --git a/arm9/src/heap.c b/arm9/src/heap.c index 842fd33a7..7605bfe71 100644 --- a/arm9/src/heap.c +++ b/arm9/src/heap.c @@ -1,3 +1,4 @@ +#include "global.h" #include "heap.h" #include "error_message_reset.h" #include "unk_02031734.h" @@ -26,7 +27,7 @@ typedef struct MemoryBlock struct HeapInfo sHeapInfo; -THUMB_FUNC void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) +void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) { void * ptr; u32 unk_size, i; @@ -111,7 +112,7 @@ THUMB_FUNC void InitHeapSystem(const struct HeapParam *templates, u32 nTemplates } } -THUMB_FUNC s32 FindFirstAvailableHeapHandle() +s32 FindFirstAvailableHeapHandle() { s32 i; @@ -124,17 +125,17 @@ THUMB_FUNC s32 FindFirstAvailableHeapHandle() return -1; } -THUMB_FUNC BOOL CreateHeap(u32 parent, u32 child, u32 size) +BOOL CreateHeap(u32 parent, u32 child, u32 size) { return CreateHeapInternal(parent, child, size, 4); } -THUMB_FUNC BOOL CreateHeapAtEnd(u32 parent, u32 child, u32 size) +BOOL CreateHeapAtEnd(u32 parent, u32 child, u32 size) { return CreateHeapInternal(parent, child, size, -4); } -THUMB_FUNC BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment) +BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -188,7 +189,7 @@ THUMB_FUNC BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignmen return FALSE; } -THUMB_FUNC void DestroyHeap(u32 heap_id) +void DestroyHeap(u32 heap_id) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -218,7 +219,7 @@ THUMB_FUNC void DestroyHeap(u32 heap_id) } } -THUMB_FUNC void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heap_id) +void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heap_id) { GF_ASSERT(heap); @@ -237,7 +238,7 @@ THUMB_FUNC void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alig return ptr; } -THUMB_FUNC void AllocFail() +void AllocFail() { if (FUN_02031810() != 0) { @@ -336,7 +337,7 @@ void FreeToHeapExplicit(u32 heap_id, void *ptr) GF_ASSERT(0); } -THUMB_FUNC u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heap_id) +u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heap_id) { if (heap_id < sHeapInfo.totalNumHeaps) { @@ -348,7 +349,7 @@ THUMB_FUNC u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heap_id) return 0; } -THUMB_FUNC void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, u32 heap_id, int alignment) +void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, u32 heap_id, int alignment) { if (heap_id < sHeapInfo.totalNumHeaps) { @@ -361,7 +362,7 @@ THUMB_FUNC void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, u32 he GF_ASSERT(0); } -THUMB_FUNC void ReallocFromHeap(void *ptr, u32 newSize) +void ReallocFromHeap(void *ptr, u32 newSize) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -379,7 +380,7 @@ THUMB_FUNC void ReallocFromHeap(void *ptr, u32 newSize) GF_ASSERT(0); } -THUMB_FUNC BOOL GF_heap_c_dummy_return_true(u32 heap_id) +BOOL GF_heap_c_dummy_return_true(u32 heap_id) { #pragma unused(heap_id) return TRUE; diff --git a/arm9/src/igt.c b/arm9/src/igt.c index 843ef396b..7b72e530a 100644 --- a/arm9/src/igt.c +++ b/arm9/src/igt.c @@ -1,8 +1,6 @@ #include "global.h" #include "igt.h" -#pragma thumb on - void InitIGT(struct IGT * igt) { igt->hours = 0; diff --git a/arm9/src/itemtool.c b/arm9/src/itemtool.c index 545fa5d43..c94be747c 100644 --- a/arm9/src/itemtool.c +++ b/arm9/src/itemtool.c @@ -5,8 +5,6 @@ #include "heap.h" #include "constants/moves.h" -#pragma thumb on - static const u16 sMailIdxs[] = { ITEM_GRASS_MAIL, ITEM_FLAME_MAIL, diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c index 097dfa32f..3f4a8fb9b 100644 --- a/arm9/src/list_menu.c +++ b/arm9/src/list_menu.c @@ -10,7 +10,7 @@ void ListMenuDrawCursor(struct ListMenu * list); BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown); void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit); -THUMB_FUNC struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id) +struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id) { struct ListMenu * list = AllocFromHeap(heap_id, sizeof(struct ListMenu)); list->template = *template; @@ -47,7 +47,7 @@ THUMB_FUNC struct ListMenu * ListMenuInit(const struct ListMenuTemplate * templa return list; } -THUMB_FUNC s32 ListMenu_ProcessInput(struct ListMenu * list) +s32 ListMenu_ProcessInput(struct ListMenu * list) { list->unk_33 = 0; @@ -105,7 +105,7 @@ THUMB_FUNC s32 ListMenu_ProcessInput(struct ListMenu * list) } } -THUMB_FUNC void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove) +void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * itemsAbove) { if (cursorPos != NULL) *cursorPos = list->cursorPos; @@ -115,7 +115,7 @@ THUMB_FUNC void DestroyListMenu(struct ListMenu * list, u16 * cursorPos, u16 * i FreeToHeapExplicit(list->heap_id, list); } -THUMB_FUNC void RedrawListMenu(struct ListMenu * list) +void RedrawListMenu(struct ListMenu * list) { FillWindowPixelBuffer(list->template.window, list->template.fillValue); ListMenuPrintEntries(list, list->cursorPos, 0, list->template.maxShowed); @@ -123,7 +123,7 @@ THUMB_FUNC void RedrawListMenu(struct ListMenu * list) CopyWindowToVram(list->template.window); } -THUMB_FUNC s32 ListMenuTestInputInternal(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 updateFlag, u16 input, u16 *newCursorPos, u16 *newItemsAbove) +s32 ListMenuTestInputInternal(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 updateFlag, u16 input, u16 *newCursorPos, u16 *newItemsAbove) { if (template != NULL) list->template = *template; @@ -151,12 +151,12 @@ THUMB_FUNC s32 ListMenuTestInputInternal(struct ListMenu * list, const struct Li return -1; } -THUMB_FUNC s32 ListMenuTestInput(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 input, u16 *newCursorPos, u16 *newItemsAbove) +s32 ListMenuTestInput(struct ListMenu * list, const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u16 input, u16 *newCursorPos, u16 *newItemsAbove) { return ListMenuTestInputInternal(list, template, cursorPos, itemsAbove, FALSE, input, newCursorPos, newItemsAbove); } -THUMB_FUNC void ListMenuOverrideSetColors(struct ListMenu * list, u8 cursorPal, u8 fillValue, u8 cursorShadowPal) +void ListMenuOverrideSetColors(struct ListMenu * list, u8 cursorPal, u8 fillValue, u8 cursorShadowPal) { list->cursorPal = cursorPal; list->fillValue = fillValue; @@ -164,12 +164,12 @@ THUMB_FUNC void ListMenuOverrideSetColors(struct ListMenu * list, u8 cursorPal, list->overrideEnabled = TRUE; } -THUMB_FUNC void ListMenuGetCurrentItemArrayId(struct ListMenu * list, u16 * index_p) +void ListMenuGetCurrentItemArrayId(struct ListMenu * list, u16 * index_p) { *index_p = (u16)(list->cursorPos + list->itemsAbove); } -THUMB_FUNC void ListMenuGetScrollAndRow(struct ListMenu * list, u16 * cursorPos_p, u16 * itemsAbove_p) +void ListMenuGetScrollAndRow(struct ListMenu * list, u16 * cursorPos_p, u16 * itemsAbove_p) { if (cursorPos_p != NULL) *cursorPos_p = list->cursorPos; @@ -177,17 +177,17 @@ THUMB_FUNC void ListMenuGetScrollAndRow(struct ListMenu * list, u16 * cursorPos_ *itemsAbove_p = list->itemsAbove; } -THUMB_FUNC u8 ListMenuGetUnk33(struct ListMenu * list) +u8 ListMenuGetUnk33(struct ListMenu * list) { return list->unk_33; } -THUMB_FUNC s32 ListMenuGetValueByArrayId(struct ListMenu * list, s32 index) +s32 ListMenuGetValueByArrayId(struct ListMenu * list, s32 index) { return list->template.items[index].value; } -THUMB_FUNC s32 ListMenuGetTemplateField(struct ListMenu * list, u32 attr) +s32 ListMenuGetTemplateField(struct ListMenu * list, u32 attr) { switch (attr) { @@ -236,7 +236,7 @@ THUMB_FUNC s32 ListMenuGetTemplateField(struct ListMenu * list, u32 attr) return -1; } -THUMB_FUNC void ListMenuSetTemplateField(struct ListMenu * list, u32 attr, s32 value) +void ListMenuSetTemplateField(struct ListMenu * list, u32 attr, s32 value) { switch (attr) { @@ -301,12 +301,12 @@ THUMB_FUNC void ListMenuSetTemplateField(struct ListMenu * list, u32 attr, s32 v } } -THUMB_FUNC void ListMenuGetItemStr(struct ListMenu * list, struct ListMenuItem * items) +void ListMenuGetItemStr(struct ListMenu * list, struct ListMenuItem * items) { list->template.items = items; } -THUMB_FUNC void ListMenuPrint(struct ListMenu * list, struct String * str, u8 x, u8 y) +void ListMenuPrint(struct ListMenu * list, struct String * str, u8 x, u8 y) { if (str != NULL) { @@ -321,7 +321,7 @@ THUMB_FUNC void ListMenuPrint(struct ListMenu * list, struct String * str, u8 x, } } -THUMB_FUNC void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16 yOffset, u16 count) +void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16 yOffset, u16 count) { s32 i; u8 x, y; @@ -341,7 +341,7 @@ THUMB_FUNC void ListMenuPrintEntries(struct ListMenu * list, u16 startIndex, u16 } } -THUMB_FUNC void ListMenuDrawCursor(struct ListMenu * list) +void ListMenuDrawCursor(struct ListMenu * list) { u8 yMultiplier = (u8)(GetFontAttribute((u8)list->template.fontId, 1) + list->template.itemVerticalPadding); u8 x = list->template.cursor_X; @@ -358,7 +358,7 @@ THUMB_FUNC void ListMenuDrawCursor(struct ListMenu * list) } } -THUMB_FUNC void ListMenuErasePrintedCursor(struct ListMenu * list, u16 itemsAbove) +void ListMenuErasePrintedCursor(struct ListMenu * list, u16 itemsAbove) { switch (list->template.cursorKind) { @@ -380,7 +380,7 @@ THUMB_FUNC void ListMenuErasePrintedCursor(struct ListMenu * list, u16 itemsAbov } } -THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, u8 movingDown) +u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, u8 movingDown) { u32 cursorPos; u16 itemsAbove; @@ -462,7 +462,7 @@ THUMB_FUNC u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *lis return 2; } -THUMB_FUNC void ListMenuScroll(struct ListMenu * list, u8 count, u8 movingDown) +void ListMenuScroll(struct ListMenu * list, u8 count, u8 movingDown) { if (count >= list->template.maxShowed) { @@ -502,7 +502,7 @@ THUMB_FUNC void ListMenuScroll(struct ListMenu * list, u8 count, u8 movingDown) } } -THUMB_FUNC BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown) +BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorAndCallCallback, u8 count, u8 movingDown) { u16 oldSelectedRow; u8 selectionChange, i, cursorCount; @@ -550,7 +550,7 @@ THUMB_FUNC BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorA return FALSE; } -THUMB_FUNC void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit) +void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit) { if (list->template.moveCursorFunc != NULL) { @@ -558,7 +558,7 @@ THUMB_FUNC void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 } } -THUMB_FUNC void ListMenuCopyToVram(struct ListMenu * list) +void ListMenuCopyToVram(struct ListMenu * list) { CopyWindowToVram(list->template.window); } diff --git a/arm9/src/list_menu_items.c b/arm9/src/list_menu_items.c index fc0ba20e5..159ff9e52 100644 --- a/arm9/src/list_menu_items.c +++ b/arm9/src/list_menu_items.c @@ -5,7 +5,7 @@ void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items); -THUMB_FUNC struct ListMenuItem * ListMenuItems_New(u32 count, u32 heap_id) +struct ListMenuItem * ListMenuItems_New(u32 count, u32 heap_id) { s32 i; struct ListMenuItem * ret = AllocFromHeap(heap_id, (count + 1) * sizeof(struct ListMenuItem)); @@ -22,13 +22,13 @@ THUMB_FUNC struct ListMenuItem * ListMenuItems_New(u32 count, u32 heap_id) return ret; } -THUMB_FUNC void ListMenuItems_Delete(struct ListMenuItem * items) +void ListMenuItems_Delete(struct ListMenuItem * items) { ListMenuItems_DestroyMenuStrings(items); FreeToHeap(items); } -THUMB_FUNC void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData * msgData, u32 msgNo, s32 value) +void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, struct MsgData * msgData, u32 msgNo, s32 value) { u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); @@ -39,7 +39,7 @@ THUMB_FUNC void ListMenuItems_AppendFromMsgData(struct ListMenuItem * items, str } } -THUMB_FUNC void ListMenuItems_AddItem(struct ListMenuItem * items, struct String * str, s32 value) +void ListMenuItems_AddItem(struct ListMenuItem * items, struct String * str, s32 value) { u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); @@ -50,7 +50,7 @@ THUMB_FUNC void ListMenuItems_AddItem(struct ListMenuItem * items, struct String } } -THUMB_FUNC void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * src) +void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListMenuItem * src) { u32 heap_id; struct ListMenuItem * newItem = ListMenuItems_SeekEnd(items, &heap_id); @@ -61,7 +61,7 @@ THUMB_FUNC void ListMenuItems_CopyItem(struct ListMenuItem * items, struct ListM } } -THUMB_FUNC struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * heap_id_p) +struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * items, u32 * heap_id_p) { struct ListMenuItem * ret; for (; items->text != NULL; items++) @@ -79,7 +79,7 @@ THUMB_FUNC struct ListMenuItem * ListMenuItems_SeekEnd(struct ListMenuItem * ite return ret; } -THUMB_FUNC void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items) +void ListMenuItems_DestroyMenuStrings(struct ListMenuItem * items) { s32 i; for (i = 0; items[i].text != (struct String *)-1u; i++) diff --git a/arm9/src/mail.c b/arm9/src/mail.c index 4b59fb322..b1c5b0016 100644 --- a/arm9/src/mail.c +++ b/arm9/src/mail.c @@ -7,8 +7,6 @@ #include "party.h" #include "player_data.h" -#pragma thumb on - extern u32 FUN_0206B6C8(struct Pokemon * pokemon); extern u16 FUN_0206B7BC(u16 species, u32 forme, BOOL is_egg); diff --git a/arm9/src/mail_message.c b/arm9/src/mail_message.c index a43ff4fe2..da9c8fd96 100644 --- a/arm9/src/mail_message.c +++ b/arm9/src/mail_message.c @@ -6,8 +6,6 @@ #include "string_control_code.h" #include "constants/easy_chat.h" -#pragma thumb on - struct UnkStruct_020ED556 { u8 unk_0; diff --git a/arm9/src/main.c b/arm9/src/main.c index b770cafcf..0e6699ed1 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -48,7 +48,7 @@ const int gGameLanguage = GAME_LANGUAGE; const int gGameVersion = GAME_VERSION; __declspec(noreturn) -THUMB_FUNC void NitroMain(void) +void NitroMain(void) { InitSystemForTheGame(); InitGraphicMemory(); @@ -135,7 +135,7 @@ THUMB_FUNC void NitroMain(void) } } -THUMB_FUNC void FUN_02000DF4(void) +void FUN_02000DF4(void) { UNK_02016FA8.mainOverlayId = SDK_OVERLAY_INVALID_ID; UNK_02016FA8.overlayManager = NULL; @@ -143,7 +143,7 @@ THUMB_FUNC void FUN_02000DF4(void) UNK_02016FA8.template = NULL; } -THUMB_FUNC void Main_RunOverlayManager(void) +void Main_RunOverlayManager(void) { if (UNK_02016FA8.overlayManager == NULL) { @@ -165,14 +165,14 @@ THUMB_FUNC void Main_RunOverlayManager(void) } } -THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct OverlayManagerTemplate *template) +void RegisterMainOverlay(FSOverlayID id, const struct OverlayManagerTemplate *template) { GF_ASSERT(UNK_02016FA8.template == NULL); UNK_02016FA8.queuedMainOverlayId = id; UNK_02016FA8.template = template; } -THUMB_FUNC void FUN_02000E9C(void) +void FUN_02000E9C(void) { FUN_0202FB80(); OS_WaitIrq(TRUE, OS_IE_V_BLANK); @@ -182,7 +182,7 @@ THUMB_FUNC void FUN_02000E9C(void) gSystem.vBlankIntr(gSystem.vBlankIntrArg); } -THUMB_FUNC void FUN_02000EC8(u32 parameter) +void FUN_02000EC8(u32 parameter) { if (FUN_02033678() && CARD_TryWaitBackupAsync() == TRUE) { @@ -191,7 +191,7 @@ THUMB_FUNC void FUN_02000EC8(u32 parameter) FUN_02000E9C(); } -THUMB_FUNC void FUN_02000EE8(void) +void FUN_02000EE8(void) { u32 r1 = FUN_020335B8(); switch (r1) @@ -211,7 +211,7 @@ THUMB_FUNC void FUN_02000EE8(void) extern void FUN_0200E3A0(PMLCDTarget, int); __declspec(noreturn) -THUMB_FUNC void DoSoftReset(u32 parameter) +void DoSoftReset(u32 parameter) { FUN_0200E3A0(PM_LCD_TOP, 0x7FFF); FUN_0200E3A0(PM_LCD_BOTTOM, 0x7FFF); @@ -226,7 +226,7 @@ THUMB_FUNC void DoSoftReset(u32 parameter) } while (1); } -THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1) +void FUN_02000F4C(u32 arg0, u32 arg1) { if (arg1 == 3) { @@ -256,7 +256,7 @@ extern void GF_RTC_CopyDateTime(struct Unk21C4818 *, struct Unk21C4828 *); extern void SetMTRNGSeed(u32); extern void SetLCRNGSeed(u32); -THUMB_FUNC void InitializeMainRNG(void) +void InitializeMainRNG(void) { struct Unk21C4818 spC; struct Unk21C4828 sp0; @@ -272,7 +272,7 @@ THUMB_FUNC void InitializeMainRNG(void) extern void FUN_0201CE04(void); extern void FUN_0201CDD0(void); -THUMB_FUNC void HandleDSLidAction(void) +void HandleDSLidAction(void) { PMBackLightSwitch top, bottom; if (PAD_DetectFold()) diff --git a/arm9/src/map_header.c b/arm9/src/map_header.c index a766a8fdd..99b8b172c 100644 --- a/arm9/src/map_header.c +++ b/arm9/src/map_header.c @@ -13,8 +13,6 @@ #include "constants/sndseq.h" #include "constants/maps.h" -#pragma thumb on - #define ENCDATA(dia,pea) ((GAME_VERSION == VERSION_DIAMOND) ? (dia) : (pea)) // Static decls diff --git a/arm9/src/map_matrix.c b/arm9/src/map_matrix.c index 1808d82cb..b6618a7dc 100644 --- a/arm9/src/map_matrix.c +++ b/arm9/src/map_matrix.c @@ -5,7 +5,7 @@ #include "heap.h" #include "map_header.h" -THUMB_FUNC static void MapMatrix_MapMatrixData_Load( +static void MapMatrix_MapMatrixData_Load( struct MapMatrixData *map_matrix, u16 file_id, u32 map_id) { map_matrix->width = 0; @@ -64,7 +64,7 @@ THUMB_FUNC static void MapMatrix_MapMatrixData_Load( FreeToHeap(buffer); } -THUMB_FUNC struct MapMatrix *MapMatrix_New(void) +struct MapMatrix *MapMatrix_New(void) { struct MapMatrix *map_matrix = AllocFromHeap(11, sizeof(struct MapMatrix)); @@ -75,7 +75,7 @@ THUMB_FUNC struct MapMatrix *MapMatrix_New(void) return map_matrix; } -THUMB_FUNC void MapMatrix_Load(u16 map_id, struct MapMatrix *map_matrix) +void MapMatrix_Load(u16 map_id, struct MapMatrix *map_matrix) { u16 matrix_id = MapHeader_GetMatrixId(map_id); @@ -86,33 +86,33 @@ THUMB_FUNC void MapMatrix_Load(u16 map_id, struct MapMatrix *map_matrix) map_matrix->width = map_matrix->data.width; } -THUMB_FUNC void MapMatrix_Free(struct MapMatrix *map_matrix) +void MapMatrix_Free(struct MapMatrix *map_matrix) { FreeToHeap(map_matrix); } -THUMB_FUNC u16 MapMatrix_GetMapData(s32 map_id, struct MapMatrix *map_matrix) +u16 MapMatrix_GetMapData(s32 map_id, struct MapMatrix *map_matrix) { GF_ASSERT(map_id < map_matrix->width * map_matrix->height); return map_matrix->data.maps.data[map_id]; } -THUMB_FUNC u8 MapMatrix_GetWidth(struct MapMatrix *map_matrix) +u8 MapMatrix_GetWidth(struct MapMatrix *map_matrix) { GF_ASSERT(map_matrix != NULL); return map_matrix->width; } -THUMB_FUNC u8 MapMatrix_GetHeight(struct MapMatrix *map_matrix) +u8 MapMatrix_GetHeight(struct MapMatrix *map_matrix) { GF_ASSERT(map_matrix != NULL); return map_matrix->height; } -THUMB_FUNC u16 MapMatrix_GetMapHeader(struct MapMatrix *map_matrix, s32 x, s32 y) +u16 MapMatrix_GetMapHeader(struct MapMatrix *map_matrix, s32 x, s32 y) { s32 width = map_matrix->width; s32 height = map_matrix->height; @@ -123,7 +123,7 @@ THUMB_FUNC u16 MapMatrix_GetMapHeader(struct MapMatrix *map_matrix, s32 x, s32 y return map_matrix->data.headers[y * width + x]; } -THUMB_FUNC u16 MapMatrix_GetMapHeaderFromID(struct MapMatrix *map_matrix, s32 map_id) +u16 MapMatrix_GetMapHeaderFromID(struct MapMatrix *map_matrix, s32 map_id) { s32 max_map_id = map_matrix->width * map_matrix->height; @@ -132,12 +132,12 @@ THUMB_FUNC u16 MapMatrix_GetMapHeaderFromID(struct MapMatrix *map_matrix, s32 ma return map_matrix->data.headers[map_id]; } -THUMB_FUNC u8 MapMatrix_GetMatrixID(struct MapMatrix *map_matrix) +u8 MapMatrix_GetMatrixID(struct MapMatrix *map_matrix) { return map_matrix->matrix_id; } -THUMB_FUNC u32 MapMatrix_GetMapAltitude( +u32 MapMatrix_GetMapAltitude( struct MapMatrix *map_matrix, u8 param1, s16 x, s16 y, int matrix_width) { #pragma unused(param1) @@ -147,7 +147,7 @@ THUMB_FUNC u32 MapMatrix_GetMapAltitude( return map_matrix->data.altitudes[y * matrix_width + x]; } -THUMB_FUNC struct MapData *MapMatrix_MapData_New(u32 heap_id) +struct MapData *MapMatrix_MapData_New(u32 heap_id) { struct MapData *map_data = AllocFromHeap(heap_id, sizeof(struct MapData)); void *buffer = @@ -165,18 +165,18 @@ THUMB_FUNC struct MapData *MapMatrix_MapData_New(u32 heap_id) return map_data; } -THUMB_FUNC void MapMatrix_MapData_Free(struct MapData *map_data) +void MapMatrix_MapData_Free(struct MapData *map_data) { GF_ASSERT(map_data != NULL); FreeToHeap(map_data); } -THUMB_FUNC u16 MapMatrix_MapData_GetData(struct MapData *map_data, s32 x, s32 y) +u16 MapMatrix_MapData_GetData(struct MapData *map_data, s32 x, s32 y) { return map_data->data[MAP_MATRIX_MAX_WIDTH * y + x]; } -THUMB_FUNC u16 GetMapHeader(u32 file_id, u16 x, u16 y) +u16 GetMapHeader(u32 file_id, u16 x, u16 y) { struct MapMatrixData map_matrix; @@ -187,13 +187,13 @@ THUMB_FUNC u16 GetMapHeader(u32 file_id, u16 x, u16 y) return map_matrix.headers[y * map_matrix.width + x]; } -THUMB_FUNC u16 GetMapData(s32 map_id, struct MapMatrix *map_matrix) +u16 GetMapData(s32 map_id, struct MapMatrix *map_matrix) { GF_ASSERT(map_matrix != NULL); return MapMatrix_GetMapData(map_id, map_matrix); } -THUMB_FUNC void FUN_02034678(struct MapMatrix *map_matrix) +void FUN_02034678(struct MapMatrix *map_matrix) { u16 *maps = map_matrix->data.maps.data; u8 *altitudes = map_matrix->data.altitudes; @@ -214,7 +214,7 @@ THUMB_FUNC void FUN_02034678(struct MapMatrix *map_matrix) altitudes[width * 0x16 + 0x18] = 2; } -THUMB_FUNC void FUN_020346CC(struct MapMatrix *map_matrix) +void FUN_020346CC(struct MapMatrix *map_matrix) { u16 *maps = map_matrix->data.maps.data; u8 width = map_matrix->width; diff --git a/arm9/src/math_util.c b/arm9/src/math_util.c index 454c28f44..fdc10754d 100644 --- a/arm9/src/math_util.c +++ b/arm9/src/math_util.c @@ -523,32 +523,32 @@ static const u16 UNK_020EDB80[] = /* * Temporary prototypes; keep until all files using math_util are decompiled. */ -THUMB_FUNC s32 Sin(u16 degrees); -THUMB_FUNC s32 Cos(u16 degrees); -THUMB_FUNC s32 Sin_Wrap(u16 degrees); -THUMB_FUNC s32 Cos_Wrap(u16 degrees); -THUMB_FUNC u16 MathUtil_0201B9A0(u16 x); -THUMB_FUNC s32 Sin32(s32 degrees); +s32 Sin(u16 degrees); +s32 Cos(u16 degrees); +s32 Sin_Wrap(u16 degrees); +s32 Cos_Wrap(u16 degrees); +u16 MathUtil_0201B9A0(u16 x); +s32 Sin32(s32 degrees); -THUMB_FUNC u32 GetLCRNGSeed(); -THUMB_FUNC void SetLCRNGSeed(u32 seed); -THUMB_FUNC u16 LCRandom(void); +u32 GetLCRNGSeed(); +void SetLCRNGSeed(u32 seed); +u16 LCRandom(void); -THUMB_FUNC u32 PRandom(u32 seed); +u32 PRandom(u32 seed); -THUMB_FUNC void SetMTRNGSeed(u32 seed); -THUMB_FUNC u32 MTRandom(void); +void SetMTRNGSeed(u32 seed); +u32 MTRandom(void); -THUMB_FUNC void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y, u8 type); +void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y, u8 type); -THUMB_FUNC s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2); -THUMB_FUNC s32 MathUtil_0201BC84(u16 arg0, s32 arg1); +s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2); +s32 MathUtil_0201BC84(u16 arg0, s32 arg1); /* * Trigonometric functions */ // Returns the sine of a 16-bit unsigned degree value. -THUMB_FUNC s32 Sin(u16 degrees) +s32 Sin(u16 degrees) { if (degrees >= 360) return 0; @@ -556,7 +556,7 @@ THUMB_FUNC s32 Sin(u16 degrees) return gSineTable[degrees]; } // Returns the cosine of a 16-bit unsigned degree value. -THUMB_FUNC s32 Cos(u16 degrees) +s32 Cos(u16 degrees) { if (degrees >= 360) return 0; @@ -565,25 +565,25 @@ THUMB_FUNC s32 Cos(u16 degrees) } // Returns the wrapped sine of a 16-bit unsigned degree value. -THUMB_FUNC s32 Sin_Wrap(u16 degrees) +s32 Sin_Wrap(u16 degrees) { return gSineTable[degrees % 360]; } // Returns the wrapped cosine of a 16-bit unsigned degree value. -THUMB_FUNC s32 Cos_Wrap(u16 degrees) +s32 Cos_Wrap(u16 degrees) { return gSineTable[(degrees % 360) + 90]; } // Purpose unknown. -THUMB_FUNC u16 MathUtil_0201B9A0(u16 x) +u16 MathUtil_0201B9A0(u16 x) { return UNK_020EDC7E[x % 360]; } // Returns the sine of a 32-bit signed degree value. -THUMB_FUNC s32 Sin32(s32 degrees) +s32 Sin32(s32 degrees) { return gSineTable[(u16)(degrees >> 12) % 360]; } @@ -595,19 +595,19 @@ static u32 sMTRNG_State[624]; // Mersenne Twister seed storage/buffer static u32 sLCRNG_State; // Returns the Linear-congruential buffer in full. -THUMB_FUNC u32 GetLCRNGSeed() +u32 GetLCRNGSeed() { return sLCRNG_State; } // Initializes the Linear-congruential buffer with a 32-bit seed. -THUMB_FUNC void SetLCRNGSeed(u32 seed) +void SetLCRNGSeed(u32 seed) { sLCRNG_State = seed; } // Calculates an unsigned 16-bit random integer using the Linear-congruential algorithm. -THUMB_FUNC u16 LCRandom(void) +u16 LCRandom(void) { // cycle the RNG sLCRNG_State *= 0x41C64E6D; @@ -616,7 +616,7 @@ THUMB_FUNC u16 LCRandom(void) } // Returns a cheap, psuedo-random unsigned 32-bit random integer from a seed. -THUMB_FUNC u32 PRandom(u32 seed) +u32 PRandom(u32 seed) { return seed * 1812433253 + 1; // seed from Mersenne Twister algorithm } @@ -625,7 +625,7 @@ static s32 sMTRNG_Cycles = 625; // Mersenne Twister cycle counter, 625 default v static u32 sMTRNG_XOR[2] = {0, 0x9908b0df}; // Mersenne Twister XOR mask table // Initializes the Mersenne Twister buffer with a 32-bit seed. -THUMB_FUNC void SetMTRNGSeed(u32 seed) +void SetMTRNGSeed(u32 seed) { sMTRNG_State[0] = seed; @@ -634,7 +634,7 @@ THUMB_FUNC void SetMTRNGSeed(u32 seed) } // Calculates an unsigned 32-bit random integer using the Mersenne Twister algorithm. -THUMB_FUNC u32 MTRandom(void) +u32 MTRandom(void) { u32 val; s32 i; @@ -675,7 +675,7 @@ THUMB_FUNC u32 MTRandom(void) * Nitro FX specific functions */ // Rotates and scales a 2D plane by a number of degrees. -THUMB_FUNC void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y, u8 type) +void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y, u8 type) { if (type == 1) radians = (u16)((u32)(radians * 65535) >> 8); // shut up the compiler @@ -692,7 +692,7 @@ THUMB_FUNC void MTX22_2DAffine(struct Mtx22 * mtx, u16 radians, fx32 x, fx32 y, * Vector functions */ // Calculates the circular distance between two vector coordinates. -THUMB_FUNC s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2) +s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2) { struct Vecx32 v1, v2, v3, v4; fx32 f1, f2; @@ -737,14 +737,14 @@ THUMB_FUNC s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2) return ret; } -THUMB_FUNC s32 MathUtil_0201BC84(u16 arg0, s32 arg1) +s32 MathUtil_0201BC84(u16 arg0, s32 arg1) { return (arg1 * 65535) / (FX32_MUL((arg0 * 2) << FX32_INT_SHIFT, FX32_CONST(3.140f)) >> FX32_INT_SHIFT); } // Required to protect UNK_020EDB80 from dead-stripping -THUMB_FUNC s32 CALC_SomeDeadstrippedFunction(s32 arg) +s32 CALC_SomeDeadstrippedFunction(s32 arg) { return UNK_020EDB80[arg]; } diff --git a/arm9/src/message_format.c b/arm9/src/message_format.c index 1b4c6400d..c33742c96 100644 --- a/arm9/src/message_format.c +++ b/arm9/src/message_format.c @@ -19,8 +19,6 @@ #include "unk_02024E64.h" #include "unk_020286F8.h" -#pragma thumb on - extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index 10f1a6cd8..31fd6cce0 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -6,8 +6,6 @@ #include "MI_memory.h" #include "string16.h" -#pragma thumb on - static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id); static void FreeMsgDataRawData(void * data); static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable * table, u32 num, u16 * dest); diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c index 5a645eeaf..58362bced 100644 --- a/arm9/src/nutdata.c +++ b/arm9/src/nutdata.c @@ -6,8 +6,6 @@ #include "msgdata.h" #include "constants/items.h" -#pragma thumb on - NARC * OpenNutsDataNarc(u32 heap_id) { return NARC_New(NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, heap_id); diff --git a/arm9/src/oam.c b/arm9/src/oam.c index ff3405d4a..723028d18 100644 --- a/arm9/src/oam.c +++ b/arm9/src/oam.c @@ -17,7 +17,7 @@ extern void FUN_02020404(u32 heap_id); struct OamData *oamData; -THUMB_FUNC void FUN_02009EAC(s32 param0, +void FUN_02009EAC(s32 param0, s32 param1, s32 param2, s32 param3, @@ -58,7 +58,7 @@ THUMB_FUNC void FUN_02009EAC(s32 param0, InitOamData(r0, param1, r2, param3, param4, param5, param6, param7, param8); } -THUMB_FUNC void InitOamData(s32 param0, +void InitOamData(s32 param0, s32 param1, s32 param2, s32 param3, @@ -80,7 +80,7 @@ THUMB_FUNC void InitOamData(s32 param0, &oamData->oamManagers[1], (u16)param4, (u16)param5, (u16)param6, (u16)param7, 1)); } -THUMB_FUNC void ApplyAndResetOamManagerBuffer(void) +void ApplyAndResetOamManagerBuffer(void) { if (oamData != NULL) { @@ -89,7 +89,7 @@ THUMB_FUNC void ApplyAndResetOamManagerBuffer(void) } } -THUMB_FUNC void DeinitOamData(void) +void DeinitOamData(void) { GF_ASSERT(oamData); @@ -100,7 +100,7 @@ THUMB_FUNC void DeinitOamData(void) oamData = NULL; } -THUMB_FUNC void FUN_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3) +void FUN_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3) { GF_ASSERT(oamData); @@ -113,7 +113,7 @@ THUMB_FUNC void FUN_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3) FUN_0202135C(param0, param1, EntryOamManagerOamWithAffineIdxSubScreen, EntryOamManagerAffineSubScreen, FUN_020213A0, param2, param3); } -THUMB_FUNC NNSG2dOamManager *GetOamManager(u32 screen) +NNSG2dOamManager *GetOamManager(u32 screen) { GF_ASSERT(oamData); if (screen == 0) @@ -126,17 +126,17 @@ THUMB_FUNC NNSG2dOamManager *GetOamManager(u32 screen) } } -THUMB_FUNC void FUN_0200A064(u32 heap_id) +void FUN_0200A064(u32 heap_id) { FUN_020203CC(heap_id); } -THUMB_FUNC void FUN_0200A06C(u32 heap_id) +void FUN_0200A06C(u32 heap_id) { FUN_02020404(heap_id); } -THUMB_FUNC u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1) +u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1) { u32 res = NNS_G2dEntryOamManagerOamWithAffineIdx(&oamData->oamManagers[0], param0, param1); GF_ASSERT(res); @@ -144,7 +144,7 @@ THUMB_FUNC u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1) return res; } -THUMB_FUNC u32 EntryOamManagerOamWithAffineIdxSubScreen(u32 param0, u32 param1) +u32 EntryOamManagerOamWithAffineIdxSubScreen(u32 param0, u32 param1) { u32 res = NNS_G2dEntryOamManagerOamWithAffineIdx(&oamData->oamManagers[1], param0, param1); GF_ASSERT(res); @@ -152,7 +152,7 @@ THUMB_FUNC u32 EntryOamManagerOamWithAffineIdxSubScreen(u32 param0, u32 param1) return res; } -THUMB_FUNC u32 EntryOamManagerAffineMainScreen(u32 param0) +u32 EntryOamManagerAffineMainScreen(u32 param0) { u32 res = NNS_G2dEntryOamManagerAffine(&oamData->oamManagers[0], param0); GF_ASSERT(res != 0xFFFE); @@ -160,7 +160,7 @@ THUMB_FUNC u32 EntryOamManagerAffineMainScreen(u32 param0) return res; } -THUMB_FUNC u32 EntryOamManagerAffineSubScreen(u32 param0) +u32 EntryOamManagerAffineSubScreen(u32 param0) { u32 res = NNS_G2dEntryOamManagerAffine(&oamData->oamManagers[1], param0); GF_ASSERT(res != 0xFFFE); diff --git a/arm9/src/options.c b/arm9/src/options.c index 129e5ef1e..91021c946 100644 --- a/arm9/src/options.c +++ b/arm9/src/options.c @@ -5,8 +5,6 @@ #include "options.h" #include "player_data.h" -#pragma thumb on - struct Options * Options_New(u32 heap_id) { struct Options * ret = AllocFromHeap(heap_id, sizeof(struct Options)); Options_Init(ret); diff --git a/arm9/src/overlay_manager.c b/arm9/src/overlay_manager.c index f4cddc0d6..e0f781f2d 100644 --- a/arm9/src/overlay_manager.c +++ b/arm9/src/overlay_manager.c @@ -4,7 +4,7 @@ #include "heap.h" #include "overlay_manager.h" -THUMB_FUNC struct OverlayManager * OverlayManager_New(const struct OverlayManagerTemplate *template, s32 * a1, u32 heap_id) +struct OverlayManager * OverlayManager_New(const struct OverlayManagerTemplate *template, s32 * a1, u32 heap_id) { struct OverlayManager * ret = (struct OverlayManager *)AllocFromHeap(heap_id, sizeof(struct OverlayManager)); ret->template = *template; @@ -17,33 +17,33 @@ THUMB_FUNC struct OverlayManager * OverlayManager_New(const struct OverlayManage return ret; } -THUMB_FUNC void OverlayManager_Delete(struct OverlayManager * overlayManager) +void OverlayManager_Delete(struct OverlayManager * overlayManager) { FreeToHeap(overlayManager); } -THUMB_FUNC void * OverlayManager_CreateAndGetData(struct OverlayManager * overlayManager, u32 size, u32 heap_id) +void * OverlayManager_CreateAndGetData(struct OverlayManager * overlayManager, u32 size, u32 heap_id) { return overlayManager->data = AllocFromHeap(heap_id, size); } -THUMB_FUNC void * OverlayManager_GetData(struct OverlayManager * overlayManager) +void * OverlayManager_GetData(struct OverlayManager * overlayManager) { return overlayManager->data; } -THUMB_FUNC void OverlayManager_FreeData(struct OverlayManager * overlayManager) +void OverlayManager_FreeData(struct OverlayManager * overlayManager) { FreeToHeap(overlayManager->data); overlayManager->data = NULL; } -THUMB_FUNC s32 * OverlayManager_GetField18(struct OverlayManager * overlayManager) +s32 * OverlayManager_GetField18(struct OverlayManager * overlayManager) { return overlayManager->unk18; } -THUMB_FUNC BOOL OverlayManager_Run(struct OverlayManager * overlayManager) +BOOL OverlayManager_Run(struct OverlayManager * overlayManager) { switch (overlayManager->managerStatus) { diff --git a/arm9/src/palette.c b/arm9/src/palette.c index 902bb386b..17c3e3674 100644 --- a/arm9/src/palette.c +++ b/arm9/src/palette.c @@ -6,7 +6,7 @@ #include "unk_0200CA44.h" #include "unk_020222E8.h" -THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id) +struct PaletteData *FUN_02002FD0(u32 heap_id) { struct PaletteData *ptr = AllocFromHeap(heap_id, sizeof(struct PaletteData)); MI_CpuFill8(ptr, 0, sizeof(struct PaletteData)); @@ -14,12 +14,12 @@ THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id) return ptr; } -THUMB_FUNC void FUN_02002FEC(struct PaletteData *ptr) +void FUN_02002FEC(struct PaletteData *ptr) { FreeToHeap(ptr); } -THUMB_FUNC void PaletteData_SetBuffers( +void PaletteData_SetBuffers( struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size) { paletteData->pltt[index].unfadedBuf = unfadedBuf; @@ -27,7 +27,7 @@ THUMB_FUNC void PaletteData_SetBuffers( paletteData->pltt[index].bufSize = size; } -THUMB_FUNC void PaletteData_AllocBuffers( +void PaletteData_AllocBuffers( struct PaletteData *paletteData, u32 index, u32 size, u32 heap_id) { void *ptr = AllocFromHeap(heap_id, size); @@ -36,20 +36,20 @@ THUMB_FUNC void PaletteData_AllocBuffers( PaletteData_SetBuffers(paletteData, index, ptr, ptr2, size); } -THUMB_FUNC void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index) +void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index) { FreeToHeap(paletteData->pltt[index].unfadedBuf); FreeToHeap(paletteData->pltt[index].fadedBuf); } -THUMB_FUNC void PaletteData_LoadPalette( +void PaletteData_LoadPalette( struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size) { MIi_CpuCopy16(src, paletteData->pltt[index].unfadedBuf + offset, size); MIi_CpuCopy16(src, paletteData->pltt[index].fadedBuf + offset, size); } -THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData, +void PaletteData_LoadFromNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, @@ -74,7 +74,7 @@ THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData, FreeToHeap(ptr); } -THUMB_FUNC void PaletteData_LoadNarc(struct PaletteData *paletteData, +void PaletteData_LoadNarc(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, @@ -85,7 +85,7 @@ THUMB_FUNC void PaletteData_LoadNarc(struct PaletteData *paletteData, PaletteData_LoadFromNarc(paletteData, narcId, memberId, heap_id, index, size, offset, 0); } -THUMB_FUNC void FUN_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size) +void FUN_02003108(struct PaletteData *paletteData, u32 index, u16 offset, u32 size) { GF_ASSERT(offset * 2 + size <= paletteData->pltt[index].bufSize); @@ -112,7 +112,7 @@ THUMB_FUNC void FUN_02003108(struct PaletteData *paletteData, u32 index, u16 off PaletteData_LoadPalette(paletteData, ptr + offset, index, offset, (u16)size); } -THUMB_FUNC void CopyPaletteFromNarc( +void CopyPaletteFromNarc( NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest) { NNSG2dPaletteData *pltData; @@ -130,7 +130,7 @@ THUMB_FUNC void CopyPaletteFromNarc( FreeToHeap(ptr); } -THUMB_FUNC void PaletteData_CopyPalette(struct PaletteData *paletteData, +void PaletteData_CopyPalette(struct PaletteData *paletteData, u32 srcIdx, u16 srcOffset, u32 destIdx, @@ -146,17 +146,17 @@ THUMB_FUNC void PaletteData_CopyPalette(struct PaletteData *paletteData, size); } -THUMB_FUNC u16 *PaletteData_GetUnfadedBuf(struct PaletteData *paletteData, u32 index) +u16 *PaletteData_GetUnfadedBuf(struct PaletteData *paletteData, u32 index) { return paletteData->pltt[index].unfadedBuf; } -THUMB_FUNC u16 *PaletteData_GetFadedBuf(struct PaletteData *paletteData, u32 index) +u16 *PaletteData_GetFadedBuf(struct PaletteData *paletteData, u32 index) { return paletteData->pltt[index].fadedBuf; } -THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData, +u32 FUN_02003210(struct PaletteData *paletteData, u16 param1, u16 param2, s16 delay, @@ -218,7 +218,7 @@ THUMB_FUNC u32 FUN_02003210(struct PaletteData *paletteData, return r6; } -THUMB_FUNC u8 IsPaletteSelected(u16 selectedPalettes, u16 index) +u8 IsPaletteSelected(u16 selectedPalettes, u16 index) { u32 r3 = 1; if ((selectedPalettes & (1 << index)) == 0) @@ -229,7 +229,7 @@ THUMB_FUNC u8 IsPaletteSelected(u16 selectedPalettes, u16 index) return (u8)r3; } -THUMB_FUNC void FUN_02003328(struct PaletteData *param0, u16 param1) +void FUN_02003328(struct PaletteData *param0, u16 param1) { if (IsPaletteSelected(param0->unk11a_0, param1) != 1) { @@ -237,7 +237,7 @@ THUMB_FUNC void FUN_02003328(struct PaletteData *param0, u16 param1) } } -THUMB_FUNC void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2) +void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2) { u8 r0; if (param0 < 4) @@ -258,7 +258,7 @@ THUMB_FUNC void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2) *param2 &= r4; } -THUMB_FUNC void FUN_020033A4(struct PaletteFadeControl *paletteFade, +void FUN_020033A4(struct PaletteFadeControl *paletteFade, u16 selectedPalettes, s16 delay, u8 startY, @@ -291,7 +291,7 @@ THUMB_FUNC void FUN_020033A4(struct PaletteFadeControl *paletteFade, paletteFade->yDec = 1; } -THUMB_FUNC void FUN_02003464(u32 param0, struct PaletteData *param1) +void FUN_02003464(u32 param0, struct PaletteData *param1) { if (param1->unk11c == 1) { @@ -317,7 +317,7 @@ THUMB_FUNC void FUN_02003464(u32 param0, struct PaletteData *param1) } } -THUMB_FUNC void FUN_02003500(struct PaletteData *param0) +void FUN_02003500(struct PaletteData *param0) { for (u8 i = 0; i < 4; i++) { @@ -325,7 +325,7 @@ THUMB_FUNC void FUN_02003500(struct PaletteData *param0) } } -THUMB_FUNC void FUN_02003520(struct PaletteData *param0) +void FUN_02003520(struct PaletteData *param0) { for (u8 i = 4; i < 14; i++) { @@ -333,7 +333,7 @@ THUMB_FUNC void FUN_02003520(struct PaletteData *param0) } } -THUMB_FUNC void FUN_02003540(struct PaletteData *paletteData, u8 index, u32 param2) +void FUN_02003540(struct PaletteData *paletteData, u8 index, u32 param2) { if (IsPaletteSelected(paletteData->activeFadePalettes, index) != 0) { @@ -349,7 +349,7 @@ THUMB_FUNC void FUN_02003540(struct PaletteData *paletteData, u8 index, u32 para } } -THUMB_FUNC void FUN_0200359C(struct PaletteData *paletteData, u32 index, u32 param2) +void FUN_0200359C(struct PaletteData *paletteData, u32 index, u32 param2) { for (u32 i = 0; i < 0x10; i++) @@ -366,7 +366,7 @@ THUMB_FUNC void FUN_0200359C(struct PaletteData *paletteData, u32 index, u32 par FUN_02003684(paletteData, (u8)index, &paletteData->pltt[index].fadeCtrl); } -THUMB_FUNC void FUN_020035F8( +void FUN_020035F8( u16 *src, u16 *dest, struct PaletteFadeControl *fadeCtrl, u32 numEntries) { for (u32 i = 0; i < numEntries; i++) @@ -387,7 +387,7 @@ THUMB_FUNC void FUN_020035F8( } } -THUMB_FUNC void FUN_02003684( +void FUN_02003684( struct PaletteData *paletteData, u8 index, struct PaletteFadeControl *fadeCtrl) { if (fadeCtrl->y == fadeCtrl->targetY) @@ -426,7 +426,7 @@ THUMB_FUNC void FUN_02003684( fadeCtrl->y = val; } -THUMB_FUNC void FUN_0200372C(struct PaletteData *paletteData) +void FUN_0200372C(struct PaletteData *paletteData) { if (paletteData->unk11a_f == 0 && paletteData->unk118_0 != 1) { @@ -526,17 +526,17 @@ THUMB_FUNC void FUN_0200372C(struct PaletteData *paletteData) } } -THUMB_FUNC u16 FUN_020038E4(struct PaletteData *paletteData) +u16 FUN_020038E4(struct PaletteData *paletteData) { return paletteData->activeFadePalettes; } -THUMB_FUNC void FUN_020038F0(struct PaletteData *paletteData, u32 param1) +void FUN_020038F0(struct PaletteData *paletteData, u32 param1) { paletteData->unk11a_f = param1; } -THUMB_FUNC void PaletteData_FillPalette(struct PaletteData *paletteData, +void PaletteData_FillPalette(struct PaletteData *paletteData, u32 index, u32 selection, u16 value, @@ -559,7 +559,7 @@ THUMB_FUNC void PaletteData_FillPalette(struct PaletteData *paletteData, } } -THUMB_FUNC void BlendPalette(u16 *src, u16 *dest, u16 numEntries, u8 coeff, u16 blendColor) +void BlendPalette(u16 *src, u16 *dest, u16 numEntries, u8 coeff, u16 blendColor) { s32 r2 = ((struct PlttData *)&blendColor)->r; s32 g2 = ((struct PlttData *)&blendColor)->g; @@ -576,7 +576,7 @@ THUMB_FUNC void BlendPalette(u16 *src, u16 *dest, u16 numEntries, u8 coeff, u16 } } -THUMB_FUNC void BlendPaletteUnfaded(struct PaletteData *paletteData, +void BlendPaletteUnfaded(struct PaletteData *paletteData, u32 index, u16 offset, u16 numEntries, @@ -598,7 +598,7 @@ THUMB_FUNC void BlendPaletteUnfaded(struct PaletteData *paletteData, blendColor); } -THUMB_FUNC void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coeff, u16 blendColor) +void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coeff, u16 blendColor) { while (selectedPalettes != 0) { @@ -613,7 +613,7 @@ THUMB_FUNC void BlendPalettes(u16 *src, u16 *dest, u16 selectedPalettes, u8 coef } } -THUMB_FUNC void BlendPalettesUnfaded( +void BlendPalettesUnfaded( struct PaletteData *paletteData, u32 index, u16 selectedPalettes, u8 coeff, u16 blendColor) { u32 r4 = 0; @@ -637,7 +637,7 @@ THUMB_FUNC void BlendPalettesUnfaded( } } -THUMB_FUNC void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 bTone) +void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 gTone, s32 bTone) { s32 r, g, b, i; u32 gray; @@ -665,7 +665,7 @@ THUMB_FUNC void TintPalette_CustomTone(u16 *palette, s32 count, s32 rTone, s32 g } } -THUMB_FUNC void FUN_02003B40(struct PaletteData *paletteData, +void FUN_02003B40(struct PaletteData *paletteData, NarcId narcId, s32 memberId, u32 heap_id, diff --git a/arm9/src/party.c b/arm9/src/party.c index 38279e9c2..f9c9c49ac 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -2,8 +2,6 @@ #include "party.h" #include "heap.h" -#pragma thumb on - void SaveArray_Party_Init(struct PlayerParty * party); void InitPartyWithMaxSize(struct PlayerParty * party, int count); diff --git a/arm9/src/play_timer.c b/arm9/src/play_timer.c index 9675e1792..e76bc8bca 100644 --- a/arm9/src/play_timer.c +++ b/arm9/src/play_timer.c @@ -1,4 +1,5 @@ +#include "global.h" #include "play_timer.h" u64 sTimer3Start; @@ -7,12 +8,12 @@ u64 sDuration; struct IGT * sIGT_p; BOOL sTimerActive; -THUMB_FUNC void PlayTimerInit() +void PlayTimerInit() { sTimerActive = FALSE; } -THUMB_FUNC void PlayTimerStart(struct IGT *igt) +void PlayTimerStart(struct IGT *igt) { sTimerActive = TRUE; sUnused = 0; @@ -22,7 +23,7 @@ THUMB_FUNC void PlayTimerStart(struct IGT *igt) sTimer3Start = GetTimer3Count(); } -THUMB_FUNC void PlayTimerUpdate(void) +void PlayTimerUpdate(void) { if (sTimerActive) { diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c index 2d324764f..75acaa6f1 100644 --- a/arm9/src/player_data.c +++ b/arm9/src/player_data.c @@ -7,8 +7,6 @@ #include "options.h" #include "coins.h" -#pragma thumb on - void PlayerProfile_Init(struct PlayerData * data); u32 Save_PlayerData_sizeof(void) diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index bb5bb891e..2bf2b592b 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -6,14 +6,14 @@ static struct LoadedOverlay gLoadedOverlays[3][8]; -THUMB_FUNC void FreeOverlayAllocation(struct LoadedOverlay * loaded) +void FreeOverlayAllocation(struct LoadedOverlay * loaded) { GF_ASSERT(loaded->active == TRUE); GF_ASSERT(FS_UnloadOverlay(MI_PROCESSOR_ARM9, loaded->id) == TRUE); loaded->active = FALSE; } -THUMB_FUNC void UnloadOverlayByID(FSOverlayID id) +void UnloadOverlayByID(FSOverlayID id) { struct LoadedOverlay * loaded = GetLoadedOverlaysInRegion(GetOverlayLoadDestination(id)); int i; @@ -27,7 +27,7 @@ THUMB_FUNC void UnloadOverlayByID(FSOverlayID id) } } -THUMB_FUNC s32 GetOverlayLoadDestination(FSOverlayID id) +s32 GetOverlayLoadDestination(FSOverlayID id) { FSOverlayInfo info; u8 *end; @@ -44,7 +44,7 @@ THUMB_FUNC s32 GetOverlayLoadDestination(FSOverlayID id) return OVERLAY_LOAD_WRAM; } -THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) +BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) { u32 sp0 = FS_DMA_NOT_USE; struct LoadedOverlay *r3; @@ -103,7 +103,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) return TRUE; } -THUMB_FUNC BOOL CanOverlayBeLoaded(FSOverlayID id) +BOOL CanOverlayBeLoaded(FSOverlayID id) { void *start, *end, *start2, *end2; struct LoadedOverlay *r5; @@ -125,7 +125,7 @@ THUMB_FUNC BOOL CanOverlayBeLoaded(FSOverlayID id) return TRUE; } -THUMB_FUNC struct LoadedOverlay* GetLoadedOverlaysInRegion(s32 a0) +struct LoadedOverlay* GetLoadedOverlaysInRegion(s32 a0) { switch (a0) { @@ -139,7 +139,7 @@ THUMB_FUNC struct LoadedOverlay* GetLoadedOverlaysInRegion(s32 a0) } } -THUMB_FUNC BOOL GetOverlayRamBounds(FSOverlayID id, void ** start, void ** end) +BOOL GetOverlayRamBounds(FSOverlayID id, void ** start, void ** end) { FSOverlayInfo info; if (!FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id)) { @@ -151,12 +151,12 @@ THUMB_FUNC BOOL GetOverlayRamBounds(FSOverlayID id, void ** start, void ** end) return TRUE; } -THUMB_FUNC BOOL LoadOverlayNormal(MIProcessor target, FSOverlayID id) +BOOL LoadOverlayNormal(MIProcessor target, FSOverlayID id) { return FS_LoadOverlay(target, id); } -THUMB_FUNC BOOL LoadOverlayNoInit(MIProcessor target, FSOverlayID id) +BOOL LoadOverlayNoInit(MIProcessor target, FSOverlayID id) { FSOverlayInfo info; if (!FS_LoadOverlayInfo(&info, target, id)) @@ -167,7 +167,7 @@ THUMB_FUNC BOOL LoadOverlayNoInit(MIProcessor target, FSOverlayID id) return TRUE; } -THUMB_FUNC BOOL LoadOverlayNoInitAsync(MIProcessor target, FSOverlayID id) +BOOL LoadOverlayNoInitAsync(MIProcessor target, FSOverlayID id) { FSOverlayInfo info; FSFile file; diff --git a/arm9/src/pokedex.c b/arm9/src/pokedex.c index 8ea91d508..9fce443a0 100644 --- a/arm9/src/pokedex.c +++ b/arm9/src/pokedex.c @@ -7,8 +7,6 @@ #include "unk_02087A1C.h" #include "constants/species.h" -#pragma thumb on - static inline BOOL CheckDexFlag(u8 * flagArray, u16 species) { species--; diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index a4de57af4..c38b298c1 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -21,9 +21,6 @@ #include "unk_020051F4.h" #include "sound_chatot.h" - -#pragma thumb on - u32 GetMonDataInternal(struct Pokemon * pokemon, int attr, void * ptr); u32 GetBoxMonDataInternal(struct BoxPokemon * pokemon, int attr, void * ptr); void SetMonDataInternal(struct Pokemon * pokemon, int attr, void * ptr); diff --git a/arm9/src/pokemon_storage_system.c b/arm9/src/pokemon_storage_system.c index a57b383a4..4df9234a6 100644 --- a/arm9/src/pokemon_storage_system.c +++ b/arm9/src/pokemon_storage_system.c @@ -5,8 +5,6 @@ #include "msgdata.h" #include "string16.h" -#pragma thumb on - void PCStorage_Init(struct PCStorage * pc) { PCStorage_InitializeBoxes(pc); diff --git a/arm9/src/poketch.c b/arm9/src/poketch.c index 7cb1b31ad..13d43ec58 100644 --- a/arm9/src/poketch.c +++ b/arm9/src/poketch.c @@ -3,8 +3,6 @@ #include "pokemon.h" #include "poketch.h" -#pragma thumb on - extern u16 BoxMon_GetAlternateForme(struct BoxPokemon * mon); static const u8 sMarkingMapInitialPos[][2] = { diff --git a/arm9/src/render_text.c b/arm9/src/render_text.c index 6d92ab7eb..6f09fd736 100644 --- a/arm9/src/render_text.c +++ b/arm9/src/render_text.c @@ -14,7 +14,7 @@ TextFlags gTextFlags; const u8 UNK_020ECB50[] = { 0, 1, 2, 1 }; -THUMB_FUNC u32 RenderText(struct TextPrinter *printer) +u32 RenderText(struct TextPrinter *printer) { struct TextPrinterSubStruct *subStruct = @@ -302,12 +302,12 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer) return 1; } -THUMB_FUNC void FUN_02002840(u16 flag) +void FUN_02002840(u16 flag) { unk00 = flag; } -THUMB_FUNC void TextPrinterInitDownArrowCounters(struct TextPrinter *printer) +void TextPrinterInitDownArrowCounters(struct TextPrinter *printer) { struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&printer->subStructFields); @@ -322,7 +322,7 @@ THUMB_FUNC void TextPrinterInitDownArrowCounters(struct TextPrinter *printer) subStruct->downArrowDelay = 0; } -THUMB_FUNC void TextPrinterDrawDownArrow(struct TextPrinter *printer) +void TextPrinterDrawDownArrow(struct TextPrinter *printer) { struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&printer->subStructFields); @@ -383,7 +383,7 @@ THUMB_FUNC void TextPrinterDrawDownArrow(struct TextPrinter *printer) subStruct->downArrowYPosIdx++; } -THUMB_FUNC void TextPrinterClearDownArrow(struct TextPrinter *printer) +void TextPrinterClearDownArrow(struct TextPrinter *printer) { u8 bg_id = GetWindowBgId(printer->printerTemplate.window); u8 x = GetWindowX(printer->printerTemplate.window); @@ -410,7 +410,7 @@ THUMB_FUNC void TextPrinterClearDownArrow(struct TextPrinter *printer) BgCommitTilemapBufferToVram(printer->printerTemplate.window->bgConfig, bg_id); } -THUMB_FUNC BOOL TextPrinterContinue(struct TextPrinter *printer) +BOOL TextPrinterContinue(struct TextPrinter *printer) { #pragma unused(printer) if ((gSystem.newKeys & 3) != 0 || (gSystem.touchNew != 0 && gTextFlags.unk0_4 != 0)) @@ -425,7 +425,7 @@ THUMB_FUNC BOOL TextPrinterContinue(struct TextPrinter *printer) return FALSE; } -THUMB_FUNC BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer) +BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer) { struct TextPrinterSubStruct *subStruct = (struct TextPrinterSubStruct *)(&printer->subStructFields); @@ -444,7 +444,7 @@ THUMB_FUNC BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer) return FALSE; } -THUMB_FUNC BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer) +BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer) { if (gTextFlags.autoScroll) { @@ -455,7 +455,7 @@ THUMB_FUNC BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer) return TextPrinterContinue(printer); } -THUMB_FUNC u8 TextPrinterWait(struct TextPrinter *printer) +u8 TextPrinterWait(struct TextPrinter *printer) { if (gTextFlags.autoScroll) { @@ -465,38 +465,38 @@ THUMB_FUNC u8 TextPrinterWait(struct TextPrinter *printer) return (u8)TextPrinterContinue(printer); } -THUMB_FUNC void TextFlags_SetCanABSpeedUpPrint(BOOL param0) +void TextFlags_SetCanABSpeedUpPrint(BOOL param0) { gTextFlags.canABSpeedUpPrint = param0; } -THUMB_FUNC void FUN_02002B7C(s32 param0) +void FUN_02002B7C(s32 param0) { gTextFlags.autoScroll = param0 & 1; gTextFlags.unk0_5 = (param0 >> 1) & 1; } -THUMB_FUNC void FUN_02002BB8(u32 param0) +void FUN_02002BB8(u32 param0) { gTextFlags.unk0_4 = param0; } -THUMB_FUNC u8 FUN_02002BD4() +u8 FUN_02002BD4() { return gTextFlags.unk0_6; } -THUMB_FUNC void FUN_02002BE4() +void FUN_02002BE4() { gTextFlags.unk0_6 = 0; } -THUMB_FUNC u8 FUN_02002BF4() +u8 FUN_02002BF4() { return gTextFlags.unk0_7; } -THUMB_FUNC void FUN_02002C04() +void FUN_02002C04() { gTextFlags.unk0_7 = 0; } diff --git a/arm9/src/render_window.c b/arm9/src/render_window.c index c649e8110..d86882032 100644 --- a/arm9/src/render_window.c +++ b/arm9/src/render_window.c @@ -56,7 +56,7 @@ extern u32 NNS_G2dGetImageLocation(u32, u32); extern void *FUN_02012470(u16, u16, u16); extern u32 NNS_G2dGetImagePaletteLocation(u32, u32); -THUMB_FUNC u32 FUN_0200CABC( +u32 FUN_0200CABC( struct BgConfig *bgConfig, u32 layer, u32 numTiles, u32 param3, u32 heap_id) { if (param3 == 0) @@ -81,12 +81,12 @@ THUMB_FUNC u32 FUN_0200CABC( heap_id); } -THUMB_FUNC s32 FUN_0200CAFC(void) +s32 FUN_0200CAFC(void) { return NARC_winframe_narc_0024_NCLR; } -THUMB_FUNC void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, u32 heap_id) +void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer layer, u32 num_tiles, u32 paletteNumber, u8 frame_id, u32 heap_id) { s32 r1; if (frame_id != 0) @@ -118,7 +118,7 @@ THUMB_FUNC void LoadUserFrameGfx1(struct BgConfig *bg_config, enum GFBgLayer lay GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, r1, GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(paletteNumber << 5), 32, heap_id); } -THUMB_FUNC void DrawFrame1(struct BgConfig *bgConfig, +void DrawFrame1(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, @@ -142,7 +142,7 @@ THUMB_FUNC void DrawFrame1(struct BgConfig *bgConfig, bgConfig, bgId, (u16)(fillValue + 8), (u8)(x + width), (u8)(y + height), 1, 1, paletteNum); } -THUMB_FUNC void DrawFrameAndWindow1( +void DrawFrameAndWindow1( struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num) { DrawFrame1(window->bgConfig, @@ -160,7 +160,7 @@ THUMB_FUNC void DrawFrameAndWindow1( } } -THUMB_FUNC void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram) +void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram) { FillBgTilemapRect(window->bgConfig, @@ -178,17 +178,17 @@ THUMB_FUNC void ClearFrameAndWindow1(struct Window *window, BOOL copy_to_vram) } } -THUMB_FUNC s32 FUN_0200CD60(s32 param0) +s32 FUN_0200CD60(s32 param0) { return param0 + 2; } -THUMB_FUNC s32 FUN_0200CD64(s32 param0) +s32 FUN_0200CD64(s32 param0) { return param0 + 25; } -THUMB_FUNC void FUN_0200CD68( +void FUN_0200CD68( struct BgConfig *bg_config, u32 layer, u32 num_tiles, u32 param3, u8 frame_id, u32 heap_id) { @@ -204,7 +204,7 @@ THUMB_FUNC void FUN_0200CD68( GfGfxLoader_GXLoadPal(NARC_GRAPHIC_WINFRAME, FUN_0200CD64(frame_id), GF_PAL_LOCATION_SUB_BG, (enum GFPalSlotOffset)(param3 << 5), 32, heap_id); } -THUMB_FUNC void DrawFrame2(struct BgConfig *bgConfig, +void DrawFrame2(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, @@ -257,7 +257,7 @@ THUMB_FUNC void DrawFrame2(struct BgConfig *bgConfig, paletteNum); } -THUMB_FUNC void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 palette_num) +void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 palette_num) { DrawFrame2(window->bgConfig, GetWindowBgId(window), @@ -269,7 +269,7 @@ THUMB_FUNC void DrawWindowFrame2(struct Window *window, u32 fill_value, u32 pale (u16)fill_value); } -THUMB_FUNC void DrawFrameAndWindow2( +void DrawFrameAndWindow2( struct Window *window, BOOL copy_to_vram, u16 fill_value, u8 palette_num) { DrawWindowFrame2(window, fill_value, palette_num); @@ -281,7 +281,7 @@ THUMB_FUNC void DrawFrameAndWindow2( FUN_0200D18C(window, fill_value); } -THUMB_FUNC void ClearFrameAndWindow2(struct Window *window, BOOL param1) +void ClearFrameAndWindow2(struct Window *window, BOOL param1) { FillBgTilemapRect(window->bgConfig, GetWindowBgId(window), @@ -298,7 +298,7 @@ THUMB_FUNC void ClearFrameAndWindow2(struct Window *window, BOOL param1) } } -THUMB_FUNC void BlitRect4Bit(u8 *srcPixels, +void BlitRect4Bit(u8 *srcPixels, u16 srcX, u16 srcY, u16 srcWidth, @@ -324,7 +324,7 @@ THUMB_FUNC void BlitRect4Bit(u8 *srcPixels, BlitBitmapRect4Bit(&src, &dst, srcX, srcY, dstX, dstY, width, height, 0); } -THUMB_FUNC void FUN_0200D18C(struct Window *window, u16 fill_value) +void FUN_0200D18C(struct Window *window, u16 fill_value) { u32 heap_id = BgConfig_GetHeapId(window->bgConfig); u8 bg_id = GetWindowBgId(window); @@ -354,7 +354,7 @@ THUMB_FUNC void FUN_0200D18C(struct Window *window, u16 fill_value) FreeToHeap(ptr); } -THUMB_FUNC void FUN_0200D274( +void FUN_0200D274( struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id) { @@ -385,7 +385,7 @@ THUMB_FUNC void FUN_0200D274( FreeToHeap(ptr); } -THUMB_FUNC void FUN_0200D300(struct BgConfig *bg_config, +void FUN_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, @@ -416,7 +416,7 @@ THUMB_FUNC void FUN_0200D300(struct BgConfig *bg_config, } } -THUMB_FUNC void FUN_0200D378( +void FUN_0200D378( struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id) { if (param3 == 0) @@ -432,7 +432,7 @@ THUMB_FUNC void FUN_0200D378( NARC_GRAPHIC_FIELD_BOARD, param4, bg_config, bg_id, numtiles, 0x300, FALSE, heap_id); } -THUMB_FUNC void DrawFrame3(struct BgConfig *bgConfig, +void DrawFrame3(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, @@ -499,7 +499,7 @@ THUMB_FUNC void DrawFrame3(struct BgConfig *bgConfig, paletteNum); } -THUMB_FUNC void DrawWindowCorner(struct Window *window, u16 fillValue, u8 paletteNum) +void DrawWindowCorner(struct Window *window, u16 fillValue, u8 paletteNum) { u16 i, j; u16 x, y; @@ -525,7 +525,7 @@ THUMB_FUNC void DrawWindowCorner(struct Window *window, u16 fillValue, u8 palett } } -THUMB_FUNC void DrawFrameAndWindow3( +void DrawFrameAndWindow3( struct Window *window, BOOL copy_to_vram, u16 fillValue, u8 paletteNum, u8 param4) { u8 bg_id = GetWindowBgId(window); @@ -561,7 +561,7 @@ THUMB_FUNC void DrawFrameAndWindow3( FUN_0200D18C(window, fillValue); } -THUMB_FUNC void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram) +void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram) { u8 bg_id = GetWindowBgId(window); if (param1 <= 1) @@ -593,7 +593,7 @@ THUMB_FUNC void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy } } -THUMB_FUNC WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) { +WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) { u32 heap_id = BgConfig_GetHeapId(window->bgConfig); void *charptr = BgGetCharPtr(GetWindowBgId(window)); @@ -627,7 +627,7 @@ THUMB_FUNC WaitingIcon *WaitingIcon_New(struct Window *window, u32 param1) { return waitingIcon; } -THUMB_FUNC void FUN_0200D980(WaitingIcon *waitingIcon, u32 param1) { +void FUN_0200D980(WaitingIcon *waitingIcon, u32 param1) { u8 bg_id = GetWindowBgId(waitingIcon->window); u8 x = GetWindowX(waitingIcon->window); u8 y = GetWindowY(waitingIcon->window); @@ -653,7 +653,7 @@ THUMB_FUNC void FUN_0200D980(WaitingIcon *waitingIcon, u32 param1) { } } -THUMB_FUNC void FUN_0200DB7C(u32 param0, void *param1) { +void FUN_0200DB7C(u32 param0, void *param1) { WaitingIcon *waitingIcon = (WaitingIcon *)param1; //todo: see if this matches using a param if (waitingIcon->unk488 != 0) { @@ -672,22 +672,22 @@ THUMB_FUNC void FUN_0200DB7C(u32 param0, void *param1) { } } -THUMB_FUNC void FUN_0200DBE8(u32 param0, void *param1) { +void FUN_0200DBE8(u32 param0, void *param1) { FreeToHeap(param1); FUN_0200CAB4((s32)param0); } -THUMB_FUNC void FUN_0200DBFC(WaitingIcon *waitingIcon) { +void FUN_0200DBFC(WaitingIcon *waitingIcon) { FUN_0200CA98(FUN_0200DBE8, waitingIcon, 0); waitingIcon->unk488 = 1; } -THUMB_FUNC void FUN_0200DC24(WaitingIcon *waitingIcon) { +void FUN_0200DC24(WaitingIcon *waitingIcon) { FUN_0200CA98(FUN_0200DBE8, waitingIcon, 0); waitingIcon->unk488 = 2; } -THUMB_FUNC PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, s32 heapId) +PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, u16 species, u8 gender, s32 heapId) { struct UnkStruct_0200CABC_2 *r4 = FUN_0200DD70(bg_config, bg_id, param2, param3, heapId); FUN_0200DDAC(r4, heapId); @@ -700,7 +700,7 @@ THUMB_FUNC PokepicManager *DrawPokemonPicFromSpecies(struct BgConfig *bg_config, return &r4->pokepicManager; } -THUMB_FUNC PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, s32 heapId) +PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u8 param4, u16 numTiles, struct Pokemon *mon, s32 heapId) { struct UnkStruct_0200CABC_2 *r4 = FUN_0200DD70(bg_config, bg_id, param2, param3, heapId); FUN_0200DDAC(r4, heapId); @@ -713,7 +713,7 @@ THUMB_FUNC PokepicManager *DrawPokemonPicFromMon(struct BgConfig *bg_config, u8 return &r4->pokepicManager; } -THUMB_FUNC void FUN_0200DCF8(u32 param0, void *param1) +void FUN_0200DCF8(u32 param0, void *param1) { struct UnkStruct_0200CABC_2 *unk = (struct UnkStruct_0200CABC_2 *)param1; switch (unk->pokepicManager.unk00) @@ -739,7 +739,7 @@ THUMB_FUNC void FUN_0200DCF8(u32 param0, void *param1) FUN_0201FDEC(unk->unk000); } -THUMB_FUNC struct UnkStruct_0200CABC_2 *FUN_0200DD70( +struct UnkStruct_0200CABC_2 *FUN_0200DD70( struct BgConfig *bg_config, u8 bg_id, u8 param2, u8 param3, u32 param4) { struct UnkStruct_0200CABC_2 *res = FUN_0201B6C8(FUN_020061E8(FUN_0200DCF8, 0x170, 0, param4)); @@ -753,7 +753,7 @@ THUMB_FUNC struct UnkStruct_0200CABC_2 *FUN_0200DD70( return res; } -THUMB_FUNC void FUN_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1) +void FUN_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1) { const u32 UNK_020ECEA8[] = { @@ -767,7 +767,7 @@ THUMB_FUNC void FUN_0200DDAC(struct UnkStruct_0200CABC_2 *param0, u32 param1) MOD05_021D959C(param0, UNK_020ECEA8, 1, param1); } -THUMB_FUNC void FUN_0200DDD8(struct UnkStruct_0200CABC_2 *param0) +void FUN_0200DDD8(struct UnkStruct_0200CABC_2 *param0) { MOD05_021D967C(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0049_NCLR, 0, 1, 1, 0x15CD5); MOD05_021D96F4(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0047_NCER, 0, 0x15CD5); @@ -775,7 +775,7 @@ THUMB_FUNC void FUN_0200DDD8(struct UnkStruct_0200CABC_2 *param0) MOD05_021D971C(param0, NARC_GRAPHIC_WINFRAME, NARC_winframe_narc_0048_NCGR, 0, 1, 0x15CD5); } -THUMB_FUNC void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2) +void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 param2) { u32 UNK_020ECEC0[] = { 0x00, @@ -799,7 +799,7 @@ THUMB_FUNC void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8 GX_EngineBToggleLayers(0x10, GX_LAYER_TOGGLE_ON); } -THUMB_FUNC void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2) +void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2) { struct UnkStruct_02006D98 *r7 = FUN_02006D98(param0->unk162); struct SomeDrawPokemonStruct stc; @@ -808,7 +808,7 @@ THUMB_FUNC void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 FUN_020072E8(r7); } -THUMB_FUNC void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1) +void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1) { struct UnkStruct_02006D98 *r6 = FUN_02006D98(param0->unk162); struct SomeDrawPokemonStruct st0; @@ -817,7 +817,7 @@ THUMB_FUNC void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon FUN_020072E8(r6); } -THUMB_FUNC void FUN_0200DEF4( +void FUN_0200DEF4( struct UnkStruct_0200CABC_2 *param0, struct SomeDrawPokemonStruct *param1) { void *r4 = AllocFromHeap(param0->unk162, 0x1900); @@ -843,7 +843,7 @@ THUMB_FUNC void FUN_0200DEF4( FreeToHeap(res); } -THUMB_FUNC void DrawFramed10x10Square( +void DrawFramed10x10Square( struct UnkStruct_0200CABC_2 *param0, u8 paletteNum, u16 fillValue) { FillBgTilemapRect(param0->bgConfig, @@ -922,7 +922,7 @@ THUMB_FUNC void DrawFramed10x10Square( ScheduleBgTilemapBufferTransfer(param0->bgConfig, param0->bgId); } -THUMB_FUNC void ClearFramed10x10Square(struct UnkStruct_0200CABC_2 *param0) +void ClearFramed10x10Square(struct UnkStruct_0200CABC_2 *param0) { FillBgTilemapRect( param0->bgConfig, param0->bgId, 0, (u8)(param0->x - 1), (u8)(param0->y - 1), 12, 12, 0); diff --git a/arm9/src/rs_migrate_string.c b/arm9/src/rs_migrate_string.c index a5ef806a4..9a5516669 100644 --- a/arm9/src/rs_migrate_string.c +++ b/arm9/src/rs_migrate_string.c @@ -252,7 +252,7 @@ static const u16 conversion_table[][2] = { {0x019B, 0x019B}, // ü }; -static THUMB_FUNC u16 GetOpeningQuote(u32 language) +static u16 GetOpeningQuote(u32 language) { switch (language) { @@ -269,7 +269,7 @@ static THUMB_FUNC u16 GetOpeningQuote(u32 language) } } -static THUMB_FUNC u16 GetClosingQuote(u32 language) +static u16 GetClosingQuote(u32 language) { switch (language) { @@ -286,7 +286,7 @@ static THUMB_FUNC u16 GetClosingQuote(u32 language) } } -THUMB_FUNC BOOL ConvertRSStringToDPStringInternational(const u8 * rs_str, u16 * dp_str, u32 length, u32 language) +BOOL ConvertRSStringToDPStringInternational(const u8 * rs_str, u16 * dp_str, u32 length, u32 language) { BOOL notFullWidth; u32 i; diff --git a/arm9/src/sav_chatot.c b/arm9/src/sav_chatot.c index e722678c9..33aca99ec 100644 --- a/arm9/src/sav_chatot.c +++ b/arm9/src/sav_chatot.c @@ -3,40 +3,40 @@ #include "heap.h" #include "sav_chatot.h" -THUMB_FUNC u32 Save_Chatot_sizeof(void) +u32 Save_Chatot_sizeof(void) { return sizeof(struct SaveChatotSoundClip); } -THUMB_FUNC void Save_Chatot_Init(struct SaveChatotSoundClip * chatot) +void Save_Chatot_Init(struct SaveChatotSoundClip * chatot) { MI_CpuClear32(chatot, sizeof(struct SaveChatotSoundClip)); chatot->exists = FALSE; } -THUMB_FUNC struct SaveChatotSoundClip * Chatot_New(u32 heap_id) +struct SaveChatotSoundClip * Chatot_New(u32 heap_id) { struct SaveChatotSoundClip * ret = (struct SaveChatotSoundClip *)AllocFromHeap(heap_id, sizeof(struct SaveChatotSoundClip)); Save_Chatot_Init(ret); return ret; } -THUMB_FUNC struct SaveChatotSoundClip * Save_Chatot_Get(struct SaveBlock2 * sav2) +struct SaveChatotSoundClip * Save_Chatot_Get(struct SaveBlock2 * sav2) { return (struct SaveChatotSoundClip *) SaveArray_Get(sav2, 22); } -THUMB_FUNC BOOL Chatot_Exists(struct SaveChatotSoundClip * chatot) +BOOL Chatot_Exists(struct SaveChatotSoundClip * chatot) { return chatot->exists; } -THUMB_FUNC void Chatot_Invalidate(struct SaveChatotSoundClip * chatot) +void Chatot_Invalidate(struct SaveChatotSoundClip * chatot) { chatot->exists = FALSE; } -THUMB_FUNC s8 * Chatot_GetData(struct SaveChatotSoundClip * chatot) +s8 * Chatot_GetData(struct SaveChatotSoundClip * chatot) { return chatot->data; } @@ -46,7 +46,7 @@ static inline s8 transform(u8 value) return (s8)(value - 8); } -THUMB_FUNC void Chatot_Decode(s8 * dest, const s8 * data) +void Chatot_Decode(s8 * dest, const s8 * data) { s32 i; s32 dest_i; @@ -70,7 +70,7 @@ static inline u8 untransform(s8 val) return (u8)(val + 8); } -THUMB_FUNC void Chatot_Encode(struct SaveChatotSoundClip * chatot, const s8 * data) +void Chatot_Encode(struct SaveChatotSoundClip * chatot, const s8 * data) { s32 src_i; s32 i = 0; @@ -92,7 +92,7 @@ THUMB_FUNC void Chatot_Encode(struct SaveChatotSoundClip * chatot, const s8 * da } } -THUMB_FUNC void Chatot_Copy(struct SaveChatotSoundClip * dest, const struct SaveChatotSoundClip * src) +void Chatot_Copy(struct SaveChatotSoundClip * dest, const struct SaveChatotSoundClip * src) { MI_CpuCopyFast(src, dest, sizeof(struct SaveChatotSoundClip)); } diff --git a/arm9/src/sav_system_info.c b/arm9/src/sav_system_info.c index edabf8e8b..5e96d486f 100644 --- a/arm9/src/sav_system_info.c +++ b/arm9/src/sav_system_info.c @@ -6,8 +6,6 @@ #include "RTC_convert.h" #include "sav_system_info.h" -#pragma thumb on - extern void GF_RTC_CopyDateTime(RTCDate *, RTCTime *); u32 Save_SysInfo_sizeof(void) diff --git a/arm9/src/save.c b/arm9/src/save.c index 243da742b..d7dfaa813 100644 --- a/arm9/src/save.c +++ b/arm9/src/save.c @@ -7,8 +7,6 @@ #include "save_data_read_error.h" #include "save_data_write_error.h" -#pragma thumb on - // TODO: Migrate to headers // unk_02015EA0.s diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c index 4c2dd2409..2f03c4325 100644 --- a/arm9/src/save_data_read_error.c +++ b/arm9/src/save_data_read_error.c @@ -59,7 +59,7 @@ static const struct GraphicsBanks sSaveDataReadErrorGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -THUMB_FUNC void ShowSaveDataReadError(u32 heap_id) +void ShowSaveDataReadError(u32 heap_id) { struct Window window; @@ -122,7 +122,7 @@ THUMB_FUNC void ShowSaveDataReadError(u32 heap_id) } } -THUMB_FUNC void ShowGBACartRemovedError(u32 heap_id) +void ShowGBACartRemovedError(u32 heap_id) { struct Window window; diff --git a/arm9/src/save_data_write_error.c b/arm9/src/save_data_write_error.c index 0599e3e20..f896efed1 100644 --- a/arm9/src/save_data_write_error.c +++ b/arm9/src/save_data_write_error.c @@ -59,7 +59,7 @@ static const struct GraphicsBanks sSaveDataWriteErrorGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -THUMB_FUNC void ShowSaveDataWriteError(u32 heap_id, u32 err_no) +void ShowSaveDataWriteError(u32 heap_id, u32 err_no) { struct Window window; diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 6f9e426e7..e5e73258b 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "PAD_pad.h" #include "bg_window.h" @@ -113,6 +114,9 @@ extern void MOD05_021F02C4(struct FieldSystem *fieldSystem); extern void FUN_0206F3B8(struct TaskManager *taskManager); extern u16 FUN_02031190(void); extern void Script_SetMonSeenFlagBySpecies(struct FieldSystem *fieldSystem, u16 species); +extern void MOD05_021E1374(struct TaskManager *taskManager, MessageFormat *messageFormat, u16 *ptr); +extern void MOD05_021E1994(FieldSystem *fieldSystem, LocalMapObject *lastInteracted); +extern void FUN_0208A338(struct TaskManager *taskManager); u8 UNK_021C5A0C[4]; @@ -143,28 +147,29 @@ static BOOL FUN_0203B218(struct ScriptContext *ctx); /*static*/ BOOL FUN_0203BC04(ScriptContext *ctx); /*static*/ BOOL FUN_0203BC3C(struct FieldSystem *fieldSystem, u32 param1, u32 param2); /*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 param3); +static BOOL FUN_0203BE9C(ScriptContext *ctx); extern u8 sScriptConditionTable[6][3]; -THUMB_FUNC BOOL ScrCmd_Nop(struct ScriptContext *ctx) //0000 +BOOL ScrCmd_Nop(struct ScriptContext *ctx) //0000 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Dummy(struct ScriptContext *ctx) //0001 +BOOL ScrCmd_Dummy(struct ScriptContext *ctx) //0001 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_End(struct ScriptContext *ctx) //0002 +BOOL ScrCmd_End(struct ScriptContext *ctx) //0002 { StopScript(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext *ctx) //0003 +BOOL ScrCmd_Wait(struct ScriptContext *ctx) //0003 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 num = ScriptReadHalfword(ctx); @@ -176,55 +181,55 @@ THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext *ctx) //0003 return TRUE; } -THUMB_FUNC static BOOL RunPauseTimer(struct ScriptContext *ctx) +static BOOL RunPauseTimer(struct ScriptContext *ctx) { u16* VarPointer = GetVarPointer(ctx->fieldSystem, (u16)ctx->data[0]); *VarPointer = (u16)(*VarPointer - 1); return !(*VarPointer); } -THUMB_FUNC BOOL ScrCmd_DebugWatch(struct ScriptContext *ctx) //01F9 +BOOL ScrCmd_DebugWatch(struct ScriptContext *ctx) //01F9 { ScriptGetVar(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_LoadByte(struct ScriptContext *ctx) //0004 +BOOL ScrCmd_LoadByte(struct ScriptContext *ctx) //0004 { u8 index = ScriptReadByte(ctx); ctx->data[index] = ScriptReadByte(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_LoadWord(struct ScriptContext *ctx) //0005 +BOOL ScrCmd_LoadWord(struct ScriptContext *ctx) //0005 { u8 index = ScriptReadByte(ctx); ctx->data[index] = ScriptReadWord(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext *ctx) //0006 +BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext *ctx) //0006 { u8 index = ScriptReadByte(ctx); ctx->data[index] = *(u8 *)ScriptReadWord(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_WriteByteToAddr(struct ScriptContext *ctx) //0007 +BOOL ScrCmd_WriteByteToAddr(struct ScriptContext *ctx) //0007 { u8* ptr = (u8*)ScriptReadWord(ctx); *ptr = ScriptReadByte(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetPtrByte(struct ScriptContext *ctx) //0008 +BOOL ScrCmd_SetPtrByte(struct ScriptContext *ctx) //0008 { u8* ptr = (u8*)ScriptReadWord(ctx); *ptr = (u8)ctx->data[ScriptReadByte(ctx)]; return FALSE; } -THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext *ctx) //0009 +BOOL ScrCmd_CopyLocal(struct ScriptContext *ctx) //0009 { u8 index_store = ScriptReadByte(ctx); u8 index_load = ScriptReadByte(ctx); @@ -232,7 +237,7 @@ THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext *ctx) //0009 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CopyByte(struct ScriptContext *ctx) //000A +BOOL ScrCmd_CopyByte(struct ScriptContext *ctx) //000A { u8 *target = (u8 *)ScriptReadWord(ctx); u8 *source = (u8 *)ScriptReadWord(ctx); @@ -240,7 +245,7 @@ THUMB_FUNC BOOL ScrCmd_CopyByte(struct ScriptContext *ctx) //000A return FALSE; } -THUMB_FUNC static u32 Compare(u16 a, u16 b) +static u32 Compare(u16 a, u16 b) { if (a < b) { @@ -256,7 +261,7 @@ THUMB_FUNC static u32 Compare(u16 a, u16 b) } } -THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext *ctx) //000B +BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext *ctx) //000B { u8 a = (u8)ctx->data[ScriptReadByte(ctx)]; u8 b = (u8)ctx->data[ScriptReadByte(ctx)]; @@ -264,7 +269,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext *ctx) //000B return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext *ctx) //000C +BOOL ScrCmd_CompareLocalToValue(struct ScriptContext *ctx) //000C { u8 a = (u8)ctx->data[ScriptReadByte(ctx)]; u8 b = ScriptReadByte(ctx); @@ -272,7 +277,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext *ctx) //000C return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext *ctx) //000D +BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext *ctx) //000D { u8 a = (u8)ctx->data[ScriptReadByte(ctx)]; u8 b = *(u8*)ScriptReadWord(ctx); @@ -280,7 +285,7 @@ THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext *ctx) //000D return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext *ctx) //000E +BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext *ctx) //000E { u8 a = *(u8*)ScriptReadWord(ctx); u8 b = (u8)ctx->data[ScriptReadByte(ctx)]; @@ -288,7 +293,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext *ctx) //000E return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext *ctx) //000F +BOOL ScrCmd_CompareAddrToValue(struct ScriptContext *ctx) //000F { u8 a = *(u8*)ScriptReadWord(ctx); u8 b = (u8)ScriptReadByte(ctx); @@ -296,7 +301,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext *ctx) //000F return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext *ctx) //0010 +BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext *ctx) //0010 { u8 a = *(u8*)ScriptReadWord(ctx); u8 b = *(u8*)ScriptReadWord(ctx); @@ -304,7 +309,7 @@ THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext *ctx) //0010 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext *ctx) //0011 +BOOL ScrCmd_CompareVarToValue(struct ScriptContext *ctx) //0011 { u16 a = *ScriptGetVarPointer(ctx); u16 b = ScriptReadHalfword(ctx); @@ -312,7 +317,7 @@ THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext *ctx) //0011 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext *ctx) //0012 +BOOL ScrCmd_CompareVarToVar(struct ScriptContext *ctx) //0012 { u16 *a = ScriptGetVarPointer(ctx); u16 *b = ScriptGetVarPointer(ctx); @@ -320,7 +325,7 @@ THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext *ctx) //0012 return FALSE; } -THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext *ctx) //0013 +BOOL ScrCmd_RunScript(struct ScriptContext *ctx) //0013 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 *activeScriptContextsNumber = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_ACTIVE_SCRIPTCONTEXT_COUNT); @@ -332,7 +337,7 @@ THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext *ctx) //0013 return TRUE; } -THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext *ctx) //0014 +BOOL ScrCmd_RunScriptWait(struct ScriptContext *ctx) //0014 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 *unk1 = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_UNKNOWN_05); @@ -348,7 +353,7 @@ THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext *ctx) //0014 return TRUE; } -THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext *ctx) +static BOOL FUN_02039CC8(struct ScriptContext *ctx) { u8* unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_UNKNOWN_05); @@ -359,7 +364,7 @@ THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext *ctx) //0015 +BOOL ScrCmd_RestartCurrentScript(struct ScriptContext *ctx) //0015 { u8* unk = (u8 *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_UNKNOWN_05); @@ -367,14 +372,14 @@ THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext *ctx) //0015 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GoTo(struct ScriptContext *ctx) //0016 +BOOL ScrCmd_GoTo(struct ScriptContext *ctx) //0016 { s32 offset = (s32)ScriptReadWord(ctx); ScriptJump(ctx, ctx->scriptPtr + offset); return FALSE; } -THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext *ctx) //0017 +BOOL ScrCmd_ObjectGoTo(struct ScriptContext *ctx) //0017 { LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u8 id = ScriptReadByte(ctx); @@ -386,7 +391,7 @@ THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext *ctx) //0017 return FALSE; } -THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext *ctx) //0018 +BOOL ScrCmd_BgGoTo(struct ScriptContext *ctx) //0018 { u32 bgId = FUN_02046534(ctx->taskManager); u8 id = ScriptReadByte(ctx); @@ -399,7 +404,7 @@ THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext *ctx) //0018 return FALSE; } -THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext *ctx) //0019 +BOOL ScrCmd_DirectionGoTo(struct ScriptContext *ctx) //0019 { u32 *playerDirection = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_FACING_DIRECTION); u8 dir = ScriptReadByte(ctx); @@ -412,20 +417,20 @@ THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext *ctx) //0019 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Call(struct ScriptContext *ctx) //001A +BOOL ScrCmd_Call(struct ScriptContext *ctx) //001A { s32 offset = (s32)ScriptReadWord(ctx); ScriptCall(ctx, ctx->scriptPtr + offset); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Return(struct ScriptContext *ctx) //001B +BOOL ScrCmd_Return(struct ScriptContext *ctx) //001B { ScriptReturn(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext *ctx) //001C +BOOL ScrCmd_GoToIf(struct ScriptContext *ctx) //001C { u8 compareType = ScriptReadByte(ctx); s32 offset = (s32)ScriptReadWord(ctx); @@ -437,7 +442,7 @@ THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext *ctx) //001C return FALSE; } -THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext *ctx) //001D +BOOL ScrCmd_CallIf(struct ScriptContext *ctx) //001D { u8 compareType = ScriptReadByte(ctx); s32 offset = (s32)ScriptReadWord(ctx); @@ -449,7 +454,7 @@ THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext *ctx) //001D return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext *ctx) //001E +BOOL ScrCmd_SetFlag(struct ScriptContext *ctx) //001E { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptReadHalfword(ctx); @@ -457,7 +462,7 @@ THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext *ctx) //001E return FALSE; } -THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext *ctx) //001F +BOOL ScrCmd_ClearFlag(struct ScriptContext *ctx) //001F { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptReadHalfword(ctx); @@ -465,7 +470,7 @@ THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext *ctx) //001F return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext *ctx) //0020 +BOOL ScrCmd_CheckFlag(struct ScriptContext *ctx) //0020 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptReadHalfword(ctx); @@ -473,7 +478,7 @@ THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext *ctx) //0020 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext *ctx) //0021 +BOOL ScrCmd_CheckFlagVar(struct ScriptContext *ctx) //0021 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 *wk1 = ScriptGetVarPointer(ctx); @@ -482,7 +487,7 @@ THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext *ctx) //0021 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext *ctx) //0022 +BOOL ScrCmd_SetFlagVar(struct ScriptContext *ctx) //0022 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 *wk = ScriptGetVarPointer(ctx); @@ -490,7 +495,7 @@ THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext *ctx) //0022 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext *ctx) //0023 +BOOL ScrCmd_SetTrainerFlag(struct ScriptContext *ctx) //0023 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptGetVar(ctx); @@ -498,7 +503,7 @@ THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext *ctx) //0023 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext *ctx) //0024 +BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext *ctx) //0024 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptGetVar(ctx); @@ -506,7 +511,7 @@ THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext *ctx) //0024 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext *ctx) //0025 +BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext *ctx) //0025 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 flag = ScriptGetVar(ctx); @@ -514,7 +519,7 @@ THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext *ctx) //0025 return FALSE; } -THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext *ctx) //0026 +BOOL ScrCmd_AddVar(struct ScriptContext *ctx) //0026 { u16 *wk1 = ScriptGetVarPointer(ctx); u16 wk2 = ScriptGetVar(ctx); @@ -522,7 +527,7 @@ THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext *ctx) //0026 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext *ctx) //0027 +BOOL ScrCmd_SubVar(struct ScriptContext *ctx) //0027 { u16 *wk1 = ScriptGetVarPointer(ctx); u16 wk2 = ScriptGetVar(ctx); @@ -530,14 +535,14 @@ THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext *ctx) //0027 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetVar(struct ScriptContext *ctx) //0028 +BOOL ScrCmd_SetVar(struct ScriptContext *ctx) //0028 { u16 *wk = ScriptGetVarPointer(ctx); *wk = ScriptReadHalfword(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext *ctx) //0029 +BOOL ScrCmd_CopyVar(struct ScriptContext *ctx) //0029 { u16 *wk1 = ScriptGetVarPointer(ctx); u16 *wk2 = ScriptGetVarPointer(ctx); @@ -545,7 +550,7 @@ THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext *ctx) //0029 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext *ctx) //002A - todo: better name +BOOL ScrCmd_SetOrCopyVar(struct ScriptContext *ctx) //002A - todo: better name { u16 *wk1 = ScriptGetVarPointer(ctx); u16 wk2 = ScriptGetVar(ctx); @@ -553,14 +558,14 @@ THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext *ctx) //002A - todo: be return FALSE; } -THUMB_FUNC BOOL ScrCmd_Message(struct ScriptContext *ctx) //002B - todo: MessageAll? +BOOL ScrCmd_Message(struct ScriptContext *ctx) //002B - todo: MessageAll? { u8 id = ScriptReadByte(ctx); MOD05_ShowMessageInField(ctx, ctx->msgData, id); return FALSE; } -THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext *ctx) //01FA - todo: MessageAllFromNarc? +BOOL ScrCmd_MessageFrom(struct ScriptContext *ctx) //01FA - todo: MessageAllFromNarc? { u16 arc = ScriptGetVar(ctx); u16 msg = ScriptGetVar(ctx); @@ -570,7 +575,7 @@ THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext *ctx) //01FA - todo: Mes return FALSE; } -THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext *ctx) //01FB - todo: MessageFromNarc? +BOOL ScrCmd_MessageFrom2(struct ScriptContext *ctx) //01FB - todo: MessageFromNarc? { u16 arc = ScriptGetVar(ctx); u16 msg = ScriptGetVar(ctx); @@ -581,7 +586,7 @@ THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext *ctx) //01FB - todo: Me return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext *ctx) //01FC +BOOL ScrCmd_Unk01FC(struct ScriptContext *ctx) //01FC { u16 typ = ScriptReadHalfword(ctx); u16 id = ScriptReadHalfword(ctx); @@ -592,7 +597,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext *ctx) //01FC return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext *ctx) //01FD +BOOL ScrCmd_Unk01FD(struct ScriptContext *ctx) //01FD { u16 typ = ScriptReadHalfword(ctx); u16 id = ScriptReadHalfword(ctx); @@ -604,7 +609,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext *ctx) //01FD return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext *ctx) //01FE +BOOL ScrCmd_Unk01FE(struct ScriptContext *ctx) //01FE { u8 id = ScriptReadByte(ctx); @@ -628,7 +633,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext *ctx) //01FE return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext *ctx) //01FF +BOOL ScrCmd_Unk01FF(struct ScriptContext *ctx) //01FF { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 msg = ScriptReadByte(ctx); @@ -645,7 +650,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext *ctx) //01FF return TRUE; } -THUMB_FUNC BOOL ScrCmd_MessageUnown(struct ScriptContext *ctx) //026D +BOOL ScrCmd_MessageUnown(struct ScriptContext *ctx) //026D { struct UnkStruct_0203A288 myLocalStruct; u16 msg = ScriptReadHalfword(ctx); @@ -659,7 +664,7 @@ THUMB_FUNC BOOL ScrCmd_MessageUnown(struct ScriptContext *ctx) //026D return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext *ctx) //002C - todo: Message? +BOOL ScrCmd_Unk002C(struct ScriptContext *ctx) //002C - todo: Message? { u8 msg = ScriptReadByte(ctx); MOD05_021E2BD0(ctx, ctx->msgData, msg, 1, NULL); @@ -667,13 +672,13 @@ THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext *ctx) //002C - todo: Message return TRUE; } -THUMB_FUNC /*static*/ BOOL FUN_0203A2F0(struct ScriptContext *ctx) +/*static*/ BOOL FUN_0203A2F0(struct ScriptContext *ctx) { u8 *textPrinterNumber = (u8 *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); return FUN_020546C8(*textPrinterNumber); } -THUMB_FUNC BOOL ScrCmd_Unk002D(struct ScriptContext *ctx) //002D - todo: MessageFromVar? MessageFlex? +BOOL ScrCmd_Unk002D(struct ScriptContext *ctx) //002D - todo: MessageFromVar? MessageFlex? { u16 msg = ScriptGetVar(ctx); MOD05_021E2BD0(ctx, ctx->msgData, (u8)msg, 1, NULL); @@ -681,7 +686,7 @@ THUMB_FUNC BOOL ScrCmd_Unk002D(struct ScriptContext *ctx) //002D - todo: Message return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk02C0(struct ScriptContext *ctx) //02C0 +BOOL ScrCmd_Unk02C0(struct ScriptContext *ctx) //02C0 { struct UnkStruct_0203A288 myLocalStruct; u16 msg = ScriptGetVar(ctx); @@ -695,7 +700,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02C0(struct ScriptContext *ctx) //02C0 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk002E(struct ScriptContext *ctx) //002E - todo: MessageWait? MessageNoSkip? +BOOL ScrCmd_Unk002E(struct ScriptContext *ctx) //002E - todo: MessageWait? MessageNoSkip? { u16 msg = ScriptGetVar(ctx); MOD05_021E2BD0(ctx, ctx->msgData, (u8)msg, 0, NULL); @@ -703,7 +708,7 @@ THUMB_FUNC BOOL ScrCmd_Unk002E(struct ScriptContext *ctx) //002E - todo: Message return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk020C(struct ScriptContext *ctx) //020C +BOOL ScrCmd_Unk020C(struct ScriptContext *ctx) //020C { LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u8 msg = (u8)FUN_02058488(*lastInteracted); @@ -712,7 +717,7 @@ THUMB_FUNC BOOL ScrCmd_Unk020C(struct ScriptContext *ctx) //020C return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk002F(struct ScriptContext *ctx) //002F +BOOL ScrCmd_Unk002F(struct ScriptContext *ctx) //002F { u8 msg = ScriptReadByte(ctx); @@ -733,13 +738,13 @@ THUMB_FUNC BOOL ScrCmd_Unk002F(struct ScriptContext *ctx) //002F return TRUE; } -THUMB_FUNC BOOL ScrCmd_WaitButtonAB(struct ScriptContext *ctx) //0030 +BOOL ScrCmd_WaitButtonAB(struct ScriptContext *ctx) //0030 { SetupNativeScript(ctx, FUN_0203A46C); return TRUE; } -THUMB_FUNC static BOOL FUN_0203A46C(struct ScriptContext *ctx) +static BOOL FUN_0203A46C(struct ScriptContext *ctx) { #pragma unused(ctx) if (gSystem.newKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) @@ -749,14 +754,14 @@ THUMB_FUNC static BOOL FUN_0203A46C(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx) //0190 +BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx) //0190 { ctx->data[0] = ScriptGetVar(ctx); SetupNativeScript(ctx, FUN_0203A4AC); return TRUE; } -THUMB_FUNC static BOOL FUN_0203A4AC(struct ScriptContext *ctx) +static BOOL FUN_0203A4AC(struct ScriptContext *ctx) { if (gSystem.newKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -771,13 +776,13 @@ THUMB_FUNC static BOOL FUN_0203A4AC(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_WaitButton(struct ScriptContext *ctx) //0031 +BOOL ScrCmd_WaitButton(struct ScriptContext *ctx) //0031 { SetupNativeScript(ctx, FUN_0203A4E0); return TRUE; } -THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx) +static BOOL FUN_0203A4E0(struct ScriptContext *ctx) { if (gSystem.newKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -810,13 +815,13 @@ THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_WaitButtonABPad(struct ScriptContext *ctx) //0032 +BOOL ScrCmd_WaitButtonABPad(struct ScriptContext *ctx) //0032 { SetupNativeScript(ctx, FUN_0203A570); return TRUE; } -THUMB_FUNC static BOOL FUN_0203A570(struct ScriptContext *ctx) +static BOOL FUN_0203A570(struct ScriptContext *ctx) { #pragma unused(ctx) if (gSystem.newKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -828,7 +833,7 @@ THUMB_FUNC static BOOL FUN_0203A570(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx) //0033 - todo: OpenMessageBox? +BOOL ScrCmd_Unk0033(struct ScriptContext *ctx) //0033 - todo: OpenMessageBox? { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 *unk = (u8 *)FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_UNKNOWN_06); @@ -838,7 +843,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx) //0033 - todo: OpenMes return FALSE; } -THUMB_FUNC BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) //0034 +BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) //0034 { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct Window *window = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); @@ -849,7 +854,7 @@ THUMB_FUNC BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) //0034 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0035(struct ScriptContext* ctx) //0035 - todo: FreezeMessageBox? +BOOL ScrCmd_Unk0035(struct ScriptContext* ctx) //0035 - todo: FreezeMessageBox? { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct Window *window = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_WINDOW); @@ -859,7 +864,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0035(struct ScriptContext* ctx) //0035 - todo: FreezeM return FALSE; } -THUMB_FUNC BOOL ScrCmd_ScrollBg(struct ScriptContext* ctx) //003C +BOOL ScrCmd_ScrollBg(struct ScriptContext* ctx) //003C { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 *xval = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8008); @@ -880,7 +885,7 @@ THUMB_FUNC BOOL ScrCmd_ScrollBg(struct ScriptContext* ctx) //003C return TRUE; } -THUMB_FUNC static BOOL FUN_0203A6C8(struct ScriptContext* ctx) +static BOOL FUN_0203A6C8(struct ScriptContext* ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 *xval = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_SPECIAL_VAR_8008); @@ -932,7 +937,7 @@ THUMB_FUNC static BOOL FUN_0203A6C8(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx) //003C +BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx) //003C { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct String **stringBuffer1 = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_STRING_BUFFER_1); @@ -961,7 +966,7 @@ THUMB_FUNC BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx) //003C return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0037(struct ScriptContext *ctx) //0037 - todo: SetTextBoard? ColourMessageBox? +BOOL ScrCmd_Unk0037(struct ScriptContext *ctx) //0037 - todo: SetTextBoard? ColourMessageBox? { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 typ = ScriptReadByte(ctx); @@ -973,7 +978,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0037(struct ScriptContext *ctx) //0037 - todo: SetText return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0038(struct ScriptContext *ctx) //0038 - todo: ShowMessageBox? +BOOL ScrCmd_Unk0038(struct ScriptContext *ctx) //0038 - todo: ShowMessageBox? { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 req = ScriptReadByte(ctx); @@ -981,7 +986,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0038(struct ScriptContext *ctx) //0038 - todo: ShowMes return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0039(struct ScriptContext *ctx) //0039 - todo: MessageBoxWait? WaitMessageBox? +BOOL ScrCmd_Unk0039(struct ScriptContext *ctx) //0039 - todo: MessageBoxWait? WaitMessageBox? { if (MOD05_021E8148(ctx->fieldSystem->unk60) == TRUE) { @@ -992,7 +997,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0039(struct ScriptContext *ctx) //0039 - todo: Message return TRUE; } -THUMB_FUNC static BOOL FUN_0203A8A0(struct ScriptContext *ctx) +static BOOL FUN_0203A8A0(struct ScriptContext *ctx) { if (MOD05_021E8148(ctx->fieldSystem->unk60) == TRUE) { @@ -1002,7 +1007,7 @@ THUMB_FUNC static BOOL FUN_0203A8A0(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk003A(struct ScriptContext *ctx) //003A - todo: CreateMessageBoxText? +BOOL ScrCmd_Unk003A(struct ScriptContext *ctx) //003A - todo: CreateMessageBoxText? { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 *printerNumber = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); @@ -1022,7 +1027,7 @@ THUMB_FUNC BOOL ScrCmd_Unk003A(struct ScriptContext *ctx) //003A - todo: CreateM return TRUE; } -THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx) +static BOOL FUN_0203A94C(struct ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; u8 *printerNumber = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_TEXT_PRINTER_NUMBER); @@ -1072,7 +1077,7 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx) } } -THUMB_FUNC BOOL ScrCmd_Unk003B(struct ScriptContext *ctx) //003B - todo: CloseMessageBox? +BOOL ScrCmd_Unk003B(struct ScriptContext *ctx) //003B - todo: CloseMessageBox? { ctx->data[0] = ScriptReadHalfword(ctx); @@ -1080,7 +1085,7 @@ THUMB_FUNC BOOL ScrCmd_Unk003B(struct ScriptContext *ctx) //003B - todo: CloseMe return TRUE; } -THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx) +static BOOL FUN_0203AA0C(struct ScriptContext *ctx) { u16 *unk = GetVarPointer(ctx->fieldSystem, (u16)ctx->data[0]); @@ -1127,13 +1132,13 @@ THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx) } } -THUMB_FUNC BOOL ScrCmd_Menu(struct ScriptContext *ctx) //003C +BOOL ScrCmd_Menu(struct ScriptContext *ctx) //003C { FUN_02039460(ctx->fieldSystem); return FALSE; } -THUMB_FUNC BOOL ScrCmd_YesNoMenu(struct ScriptContext *ctx) //003E +BOOL ScrCmd_YesNoMenu(struct ScriptContext *ctx) //003E { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LIST_MENU_2D); @@ -1145,7 +1150,7 @@ THUMB_FUNC BOOL ScrCmd_YesNoMenu(struct ScriptContext *ctx) //003E return TRUE; } -THUMB_FUNC static BOOL FUN_0203AB00(struct ScriptContext *ctx) +static BOOL FUN_0203AB00(struct ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LIST_MENU_2D); @@ -1168,21 +1173,21 @@ THUMB_FUNC static BOOL FUN_0203AB00(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_ShowWaitingIcon(struct ScriptContext *ctx) { //018D +BOOL ScrCmd_ShowWaitingIcon(struct ScriptContext *ctx) { //018D struct Window *window = (struct Window *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW); WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); *waitingIcon = WaitingIcon_New(window, 994); return FALSE; } -THUMB_FUNC BOOL ScrCmd_HideWaitingIcon(struct ScriptContext *ctx) //018E +BOOL ScrCmd_HideWaitingIcon(struct ScriptContext *ctx) //018E { WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); FUN_0200DBFC(*waitingIcon); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0040(struct ScriptContext *ctx) //0040 +BOOL ScrCmd_Unk0040(struct ScriptContext *ctx) //0040 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); @@ -1199,7 +1204,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0040(struct ScriptContext *ctx) //0040 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0041(struct ScriptContext *ctx) //0041 +BOOL ScrCmd_Unk0041(struct ScriptContext *ctx) //0041 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); @@ -1216,7 +1221,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0041(struct ScriptContext *ctx) //0041 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0042(struct ScriptContext *ctx) //0042 +BOOL ScrCmd_Unk0042(struct ScriptContext *ctx) //0042 { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u8 unk2 = ScriptReadByte(ctx); @@ -1225,7 +1230,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0042(struct ScriptContext *ctx) //0042 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk029D(struct ScriptContext *ctx) //029D +BOOL ScrCmd_Unk029D(struct ScriptContext *ctx) //029D { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); @@ -1235,7 +1240,7 @@ THUMB_FUNC BOOL ScrCmd_Unk029D(struct ScriptContext *ctx) //029D return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0043(struct ScriptContext *ctx) //0043 +BOOL ScrCmd_Unk0043(struct ScriptContext *ctx) //0043 { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E1C54(*unk); @@ -1243,7 +1248,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0043(struct ScriptContext *ctx) //0043 return TRUE; } -THUMB_FUNC static BOOL FUN_0203AD2C(struct ScriptContext *ctx) +static BOOL FUN_0203AD2C(struct ScriptContext *ctx) { u16 *varPtr = GetVarPointer(ctx->fieldSystem, (u16)ctx->data[0]); if (*varPtr == 0xEEEE) @@ -1256,7 +1261,7 @@ THUMB_FUNC static BOOL FUN_0203AD2C(struct ScriptContext *ctx) } } -THUMB_FUNC BOOL ScrCmd_Unk02B9(struct ScriptContext *ctx) //02B9 +BOOL ScrCmd_Unk02B9(struct ScriptContext *ctx) //02B9 { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E1C54(*unk); @@ -1264,7 +1269,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02B9(struct ScriptContext *ctx) //02B9 return TRUE; } -THUMB_FUNC static BOOL FUN_0203AD78(struct ScriptContext *ctx) +static BOOL FUN_0203AD78(struct ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 *varPtr = GetVarPointer(fieldSystem, (u16)ctx->data[0]); @@ -1289,7 +1294,7 @@ THUMB_FUNC static BOOL FUN_0203AD78(struct ScriptContext *ctx) } } -THUMB_FUNC BOOL ScrCmd_Unk0044(struct ScriptContext *ctx) //0044 +BOOL ScrCmd_Unk0044(struct ScriptContext *ctx) //0044 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); @@ -1307,7 +1312,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0044(struct ScriptContext *ctx) //0044 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0045(struct ScriptContext *ctx) //0045 +BOOL ScrCmd_Unk0045(struct ScriptContext *ctx) //0045 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 *unk = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MENU_WINDOW); @@ -1325,7 +1330,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0045(struct ScriptContext *ctx) //0045 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0046(struct ScriptContext *ctx) //0046 - todo: AddListOption? +BOOL ScrCmd_Unk0046(struct ScriptContext *ctx) //0046 - todo: AddListOption? { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); u16 unk2 = ScriptGetVar(ctx); @@ -1335,7 +1340,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0046(struct ScriptContext *ctx) //0046 - todo: AddList return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0047(struct ScriptContext *ctx) //0047 - todo: ShowList? +BOOL ScrCmd_Unk0047(struct ScriptContext *ctx) //0047 - todo: ShowList? { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E1F60(*unk); @@ -1343,7 +1348,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0047(struct ScriptContext *ctx) //0047 - todo: ShowLis return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0048(struct ScriptContext *ctx) //0048 +BOOL ScrCmd_Unk0048(struct ScriptContext *ctx) //0048 { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E26CC(*unk, ScriptReadByte(ctx)); @@ -1351,21 +1356,21 @@ THUMB_FUNC BOOL ScrCmd_Unk0048(struct ScriptContext *ctx) //0048 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx) //02CF +BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx) //02CF { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E2B80(*unk, ScriptReadByte(ctx)); return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx) //02D0 +BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx) //02D0 { u32 *unk = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MENU_WINDOW); MOD05_021E2B9C(*unk, ScriptReadByte(ctx)); return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk005E(struct ScriptContext *ctx) //005E - todo: ApplyMovement? +BOOL ScrCmd_Unk005E(struct ScriptContext *ctx) //005E - todo: ApplyMovement? { u16 unk = ScriptGetVar(ctx); u32 unk2 = ScriptReadWord(ctx); @@ -1381,7 +1386,7 @@ THUMB_FUNC BOOL ScrCmd_Unk005E(struct ScriptContext *ctx) //005E - todo: ApplyMo return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk02A1(struct ScriptContext *ctx) { //02A1 +BOOL ScrCmd_Unk02A1(struct ScriptContext *ctx) { //02A1 LocalMapObject *event; //has to be defined first to match u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); @@ -1431,7 +1436,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02A1(struct ScriptContext *ctx) { //02A1 return FALSE; } -THUMB_FUNC static LocalMapObject *FUN_0203B120(struct FieldSystem *fieldSystem, u16 eventId) +static LocalMapObject *FUN_0203B120(struct FieldSystem *fieldSystem, u16 eventId) { if (eventId == 242) { @@ -1448,19 +1453,19 @@ THUMB_FUNC static LocalMapObject *FUN_0203B120(struct FieldSystem *fieldSystem, } } -THUMB_FUNC BOOL ScrCmd_WaitForMovement(struct ScriptContext *ctx) //005F +BOOL ScrCmd_WaitForMovement(struct ScriptContext *ctx) //005F { SetupNativeScript(ctx, IsAllMovementFinished); return TRUE; } -THUMB_FUNC static BOOL IsAllMovementFinished(struct ScriptContext *ctx) +static BOOL IsAllMovementFinished(struct ScriptContext *ctx) { u8 *movCounter = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); return *movCounter == 0; } -THUMB_FUNC static void FUN_0203B174(struct FieldSystem *fieldSystem, u32 param1, void *param2) +static void FUN_0203B174(struct FieldSystem *fieldSystem, u32 param1, void *param2) { UnkStruct_0203B174 *unkStruct = (UnkStruct_0203B174 *)AllocFromHeap(4, sizeof(UnkStruct_0203B174)); if (unkStruct == NULL) @@ -1474,7 +1479,7 @@ THUMB_FUNC static void FUN_0203B174(struct FieldSystem *fieldSystem, u32 param1, unkStruct->Unk00 = FUN_0200CA44((void (*)(u32, void *))FUN_0203B1A8, unkStruct, 0); } -THUMB_FUNC void FUN_0203B1A8(u32 param0, UnkStruct_0203B174 *param1) { +void FUN_0203B1A8(u32 param0, UnkStruct_0203B174 *param1) { //is it tho? #pragma unused(param0) u8 *movementCounter = (u8 *)FieldSysGetAttrAddr(param1->fieldSystem, SCRIPTENV_ACTIVE_MOVEMENT_COUNTER); @@ -1499,7 +1504,7 @@ THUMB_FUNC void FUN_0203B1A8(u32 param0, UnkStruct_0203B174 *param1) { } } -THUMB_FUNC BOOL ScrCmd_LockAllEvents(struct ScriptContext *ctx) //0060 +BOOL ScrCmd_LockAllEvents(struct ScriptContext *ctx) //0060 { struct FieldSystem *fieldSystem = ctx->fieldSystem; LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); @@ -1513,7 +1518,7 @@ THUMB_FUNC BOOL ScrCmd_LockAllEvents(struct ScriptContext *ctx) //0060 return TRUE; } -THUMB_FUNC static BOOL FUN_0203B218(struct ScriptContext *ctx) { +static BOOL FUN_0203B218(struct ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); LocalMapObject *unk0 = FUN_020553A0(fieldSystem->playerAvatar); @@ -1551,7 +1556,7 @@ THUMB_FUNC static BOOL FUN_0203B218(struct ScriptContext *ctx) { } } -THUMB_FUNC BOOL ScrCmd_LockAllEvents2(struct ScriptContext *ctx) { //02B4 +BOOL ScrCmd_LockAllEvents2(struct ScriptContext *ctx) { //02B4 struct FieldSystem *fieldSystem = ctx->fieldSystem; LocalMapObject **lastInteracted = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_LAST_INTERACTED); LocalMapObject *unk0 = FUN_020553A0(fieldSystem->playerAvatar); @@ -1588,13 +1593,13 @@ THUMB_FUNC BOOL ScrCmd_LockAllEvents2(struct ScriptContext *ctx) { //02B4 return TRUE; } -THUMB_FUNC BOOL ScrCmd_ReleaseAllEvents(struct ScriptContext *ctx) //0061 +BOOL ScrCmd_ReleaseAllEvents(struct ScriptContext *ctx) //0061 { FUN_020587B0(ctx->fieldSystem->unk34); return TRUE; } -THUMB_FUNC BOOL ScrCmd_LockEvent(struct ScriptContext *ctx) //0062 +BOOL ScrCmd_LockEvent(struct ScriptContext *ctx) //0062 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 eventId = ScriptReadHalfword(ctx); @@ -1602,7 +1607,7 @@ THUMB_FUNC BOOL ScrCmd_LockEvent(struct ScriptContext *ctx) //0062 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ReleaseEvent(struct ScriptContext *ctx) //0063 +BOOL ScrCmd_ReleaseEvent(struct ScriptContext *ctx) //0063 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 eventId = ScriptReadHalfword(ctx); @@ -1610,7 +1615,7 @@ THUMB_FUNC BOOL ScrCmd_ReleaseEvent(struct ScriptContext *ctx) //0063 return FALSE; } -THUMB_FUNC BOOL ScrCmd_AddOverworldEvent(struct ScriptContext *ctx) //0064 +BOOL ScrCmd_AddOverworldEvent(struct ScriptContext *ctx) //0064 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 eventId = ScriptGetVar(ctx); @@ -1622,7 +1627,7 @@ THUMB_FUNC BOOL ScrCmd_AddOverworldEvent(struct ScriptContext *ctx) //0064 return FALSE; } -THUMB_FUNC BOOL ScrCmd_RemoveOverworldEvent(struct ScriptContext *ctx) //0065 +BOOL ScrCmd_RemoveOverworldEvent(struct ScriptContext *ctx) //0065 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 eventId = ScriptGetVar(ctx); @@ -1630,7 +1635,7 @@ THUMB_FUNC BOOL ScrCmd_RemoveOverworldEvent(struct ScriptContext *ctx) //0065 return FALSE; } -THUMB_FUNC BOOL ScrCmd_LockCamera(struct ScriptContext *ctx) //0066 +BOOL ScrCmd_LockCamera(struct ScriptContext *ctx) //0066 { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); @@ -1645,7 +1650,7 @@ THUMB_FUNC BOOL ScrCmd_LockCamera(struct ScriptContext *ctx) //0066 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ReleaseCamera(struct ScriptContext *ctx) //0067 +BOOL ScrCmd_ReleaseCamera(struct ScriptContext *ctx) //0067 { LocalMapObject **targetPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_CAMERA_TARGET); FUN_02057654(*targetPtr); @@ -1655,7 +1660,7 @@ THUMB_FUNC BOOL ScrCmd_ReleaseCamera(struct ScriptContext *ctx) //0067 return FALSE; } -THUMB_FUNC BOOL ScrCmd_FacePlayer(struct ScriptContext *ctx) //0068 +BOOL ScrCmd_FacePlayer(struct ScriptContext *ctx) //0068 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u32 unk0 = FUN_02059E74(PlayerAvatar_GetFacingDirection(fieldSystem->playerAvatar)); @@ -1669,7 +1674,7 @@ THUMB_FUNC BOOL ScrCmd_FacePlayer(struct ScriptContext *ctx) //0068 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPlayerPosition(struct ScriptContext *ctx) //0069 +BOOL ScrCmd_GetPlayerPosition(struct ScriptContext *ctx) //0069 { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -1682,7 +1687,7 @@ THUMB_FUNC BOOL ScrCmd_GetPlayerPosition(struct ScriptContext *ctx) //0069 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetOverworldEventPosition(struct ScriptContext *ctx) //006A +BOOL ScrCmd_GetOverworldEventPosition(struct ScriptContext *ctx) //006A { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 eventId = ScriptGetVar(ctx); @@ -1696,7 +1701,7 @@ THUMB_FUNC BOOL ScrCmd_GetOverworldEventPosition(struct ScriptContext *ctx) //00 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPlayerDirection(struct ScriptContext *ctx) //01BD +BOOL ScrCmd_GetPlayerDirection(struct ScriptContext *ctx) //01BD { u16 *directionVar = ScriptGetVarPointer(ctx); @@ -1704,7 +1709,7 @@ THUMB_FUNC BOOL ScrCmd_GetPlayerDirection(struct ScriptContext *ctx) //01BD return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk006B(struct ScriptContext *ctx) //006B - todo: CheckPersonPosition? +BOOL ScrCmd_Unk006B(struct ScriptContext *ctx) //006B - todo: CheckPersonPosition? { u16 x = ScriptGetVar(ctx); u16 y = ScriptGetVar(ctx); @@ -1720,7 +1725,7 @@ THUMB_FUNC BOOL ScrCmd_Unk006B(struct ScriptContext *ctx) //006B - todo: CheckPe return FALSE; } -THUMB_FUNC BOOL ScrCmd_KeepOverworldEvent(struct ScriptContext *ctx) //006C +BOOL ScrCmd_KeepOverworldEvent(struct ScriptContext *ctx) //006C { u16 eventId = ScriptGetVar(ctx); LocalMapObject *event = FUN_02058060(ctx->fieldSystem->unk34, eventId); @@ -1728,7 +1733,7 @@ THUMB_FUNC BOOL ScrCmd_KeepOverworldEvent(struct ScriptContext *ctx) //006C return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetOverworldEventMovement(struct ScriptContext *ctx) //006D +BOOL ScrCmd_SetOverworldEventMovement(struct ScriptContext *ctx) //006D { u16 eventId = ScriptGetVar(ctx); LocalMapObject *event = FUN_02058060(ctx->fieldSystem->unk34, eventId); @@ -1737,7 +1742,7 @@ THUMB_FUNC BOOL ScrCmd_SetOverworldEventMovement(struct ScriptContext *ctx) //00 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetOverworldEventMovement(struct ScriptContext *ctx) //02AD +BOOL ScrCmd_GetOverworldEventMovement(struct ScriptContext *ctx) //02AD { u16 *variable = ScriptGetVarPointer(ctx); *variable = 0; @@ -1750,14 +1755,14 @@ THUMB_FUNC BOOL ScrCmd_GetOverworldEventMovement(struct ScriptContext *ctx) //02 return FALSE; } -THUMB_FUNC BOOL ScrCmd_OverworldEventStopFollowing(struct ScriptContext *ctx) //006E +BOOL ScrCmd_OverworldEventStopFollowing(struct ScriptContext *ctx) //006E { LocalMapObject *event = FUN_020580B4(ctx->fieldSystem->unk34, 0x30); FUN_02058EB0(event, 0xFE); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk02AB(struct ScriptContext *ctx) //02AB +BOOL ScrCmd_Unk02AB(struct ScriptContext *ctx) //02AB { u16 *variable = ScriptGetVarPointer(ctx); struct SealCase *sealCase = Save_SealCase_Get(ctx->fieldSystem->saveBlock2); @@ -1765,7 +1770,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02AB(struct ScriptContext *ctx) //02AB return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSealCountFromId(struct ScriptContext *ctx) //0093 +BOOL ScrCmd_GetSealCountFromId(struct ScriptContext *ctx) //0093 { u16 sealId = ScriptGetVar(ctx); u16 *variable = ScriptGetVarPointer(ctx); @@ -1774,7 +1779,7 @@ THUMB_FUNC BOOL ScrCmd_GetSealCountFromId(struct ScriptContext *ctx) //0093 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveSeals(struct ScriptContext *ctx) //0094 +BOOL ScrCmd_GiveSeals(struct ScriptContext *ctx) //0094 { u16 sealId = ScriptGetVar(ctx); u16 amount = ScriptGetVar(ctx); @@ -1784,7 +1789,7 @@ THUMB_FUNC BOOL ScrCmd_GiveSeals(struct ScriptContext *ctx) //0094 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPokemonForme(struct ScriptContext *ctx) //0095 +BOOL ScrCmd_GetPokemonForme(struct ScriptContext *ctx) //0095 { u16 partyPosition = ScriptGetVar(ctx); u16 *variable = ScriptGetVarPointer(ctx); @@ -1795,27 +1800,27 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonForme(struct ScriptContext *ctx) //0095 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ChoosePokemonMenu(struct ScriptContext *ctx) { //0191 +BOOL ScrCmd_ChoosePokemonMenu(struct ScriptContext *ctx) { //0191 PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *partyMenu = FUN_020379F8(0x20, ctx->fieldSystem); SetupNativeScript(ctx, FUN_0203BC04); return TRUE; } -THUMB_FUNC BOOL ScrCmd_OpenTradeScreen(struct ScriptContext *ctx) { //02A5 +BOOL ScrCmd_OpenTradeScreen(struct ScriptContext *ctx) { //02A5 PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *partyMenu = FUN_02037A1C(0x20, ctx->fieldSystem); SetupNativeScript(ctx, FUN_0203BC04); return TRUE; } -THUMB_FUNC BOOL ScrCmd_UnionChoosePokemonMenu(struct ScriptContext *ctx) { //0192 +BOOL ScrCmd_UnionChoosePokemonMenu(struct ScriptContext *ctx) { //0192 PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *partyMenu = FUN_02037B44(ctx->fieldSystem->taskManager, 0x20); return TRUE; } -THUMB_FUNC BOOL ScrCmd_GetSelectedPartySlot(struct ScriptContext *ctx) { //0193 +BOOL ScrCmd_GetSelectedPartySlot(struct ScriptContext *ctx) { //0193 u16 *variable = ScriptGetVarPointer(ctx); PartyMenuAppData **partyMenu = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); @@ -1830,7 +1835,7 @@ THUMB_FUNC BOOL ScrCmd_GetSelectedPartySlot(struct ScriptContext *ctx) { //0193 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0194(ScriptContext *ctx) { //0194 +BOOL ScrCmd_Unk0194(ScriptContext *ctx) { //0194 void **runningAppData = (void **)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 unk0 = ScriptGetVar(ctx); u16 unk1 = ScriptGetVar(ctx); @@ -1842,7 +1847,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0194(ScriptContext *ctx) { //0194 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0195(ScriptContext *ctx) { //0195 +BOOL ScrCmd_Unk0195(ScriptContext *ctx) { //0195 u16 *unk0 = ScriptGetVarPointer(ctx); u16 *unk1 = ScriptGetVarPointer(ctx); PartyMenuAppData **partyMenuData = (PartyMenuAppData **)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); @@ -1862,7 +1867,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0195(ScriptContext *ctx) { //0195 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0196(ScriptContext *ctx) { //0196 +BOOL ScrCmd_Unk0196(ScriptContext *ctx) { //0196 void **runningAppData = (void **)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 unk0 = ScriptGetVar(ctx); @@ -1871,7 +1876,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0196(ScriptContext *ctx) { //0196 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0197(ScriptContext *ctx) { //0197 +BOOL ScrCmd_Unk0197(ScriptContext *ctx) { //0197 u16 *unk0 = ScriptGetVarPointer(ctx); void **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); @@ -1884,7 +1889,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0197(ScriptContext *ctx) { //0197 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk009B(ScriptContext *ctx) { //009B +BOOL ScrCmd_Unk009B(ScriptContext *ctx) { //009B LocalMapObject **lastInteracted = (LocalMapObject **)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16 unk0 = ScriptGetVar(ctx); u16 *unk1 = ScriptGetVarPointer(ctx); @@ -1893,27 +1898,27 @@ THUMB_FUNC BOOL ScrCmd_Unk009B(ScriptContext *ctx) { //009B return FALSE; } -THUMB_FUNC BOOL ScrCmd_DummySetWeather(ScriptContext *ctx) { //009C +BOOL ScrCmd_DummySetWeather(ScriptContext *ctx) { //009C #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_DummyInitWeather(ScriptContext *ctx) { //009D +BOOL ScrCmd_DummyInitWeather(ScriptContext *ctx) { //009D #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_DummyUpdateWeather(ScriptContext *ctx) { //009E +BOOL ScrCmd_DummyUpdateWeather(ScriptContext *ctx) { //009E #pragma unused(ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_DummyGetMapPosition(ScriptContext *ctx) { //009F +BOOL ScrCmd_DummyGetMapPosition(ScriptContext *ctx) { //009F #pragma unused(ctx) return FALSE; } -THUMB_FUNC /*static*/ BOOL FUN_0203BB90(ScriptContext *ctx) { +/*static*/ BOOL FUN_0203BB90(ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; void **runningAppData = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_RUNNING_APP_DATA); @@ -1925,7 +1930,7 @@ THUMB_FUNC /*static*/ BOOL FUN_0203BB90(ScriptContext *ctx) { return TRUE; } -THUMB_FUNC /*static*/ BOOL FUN_0203BBBC(ScriptContext *ctx) { +/*static*/ BOOL FUN_0203BBBC(ScriptContext *ctx) { struct FieldSystem *fieldSystem = ctx->fieldSystem; PCBoxAppData **pcBoxDataPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); PCBoxAppData *pcBoxData = *pcBoxDataPtr; @@ -1940,21 +1945,21 @@ THUMB_FUNC /*static*/ BOOL FUN_0203BBBC(ScriptContext *ctx) { return TRUE; } -THUMB_FUNC /*static*/ BOOL FUN_0203BC04(ScriptContext *ctx) { +/*static*/ BOOL FUN_0203BC04(ScriptContext *ctx) { return !FUN_0204647C(ctx->fieldSystem); } -THUMB_FUNC BOOL ScrCmd_RestoreOverworld(ScriptContext *ctx) { //00A1 +BOOL ScrCmd_RestoreOverworld(ScriptContext *ctx) { //00A1 FUN_0204AF84(ctx->fieldSystem->taskManager); return TRUE; } -THUMB_FUNC BOOL ScrCmd_TerminateOverworldProcess(ScriptContext *ctx) { //01F8 +BOOL ScrCmd_TerminateOverworldProcess(ScriptContext *ctx) { //01F8 FUN_0204AF3C(ctx->fieldSystem->taskManager); return TRUE; } -THUMB_FUNC /*static*/ BOOL FUN_0203BC3C(struct FieldSystem *fieldSystem, u32 param1, u32 param2) { +/*static*/ BOOL FUN_0203BC3C(struct FieldSystem *fieldSystem, u32 param1, u32 param2) { SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->saveBlock2); if (param1 == 0) { if (!FUN_02027098(fashionData, param2)) { @@ -1968,7 +1973,7 @@ THUMB_FUNC /*static*/ BOOL FUN_0203BC3C(struct FieldSystem *fieldSystem, u32 par return TRUE; } -THUMB_FUNC /*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 param3) { +/*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 param3) { SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->saveBlock2); if (!FUN_0203BC3C(fieldSystem, param2, param3)) { return NULL; @@ -1981,17 +1986,17 @@ THUMB_FUNC /*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSyste return appData; } -THUMB_FUNC BOOL ScrCmd_Unk00A2(ScriptContext *ctx) { //00A2 +BOOL ScrCmd_Unk00A2(ScriptContext *ctx) { //00A2 MOD05_021F02C4(ctx->fieldSystem); return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk00A3(ScriptContext *ctx) { //00A3 +BOOL ScrCmd_Unk00A3(ScriptContext *ctx) { //00A3 FUN_0206F3B8(ctx->taskManager); return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk00A4(ScriptContext *ctx) { //00A4 +BOOL ScrCmd_Unk00A4(ScriptContext *ctx) { //00A4 FashionAppData **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); u16 *unk0 = ScriptGetVarPointer(ctx); *unk0 = (*runningAppData)->unk04; @@ -1999,13 +2004,13 @@ THUMB_FUNC BOOL ScrCmd_Unk00A4(ScriptContext *ctx) { //00A4 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0207(ScriptContext *ctx) { //0207 +BOOL ScrCmd_Unk0207(ScriptContext *ctx) { //0207 u16 *ptr = ScriptGetVarPointer(ctx); *ptr = FUN_02031190(); return TRUE; } -THUMB_FUNC BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208 +BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208 PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 species = ScriptGetVar(ctx); u16 gender = ScriptGetVar(ctx); @@ -2015,7 +2020,7 @@ THUMB_FUNC BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx) { //0208 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C +BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); u16 partyId = ScriptGetVar(ctx); struct Pokemon *mon = GetPartyMonByIndex(SaveArray_PlayerParty_Get(ctx->fieldSystem->saveBlock2), partyId); @@ -2025,3 +2030,48 @@ THUMB_FUNC BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx) { //028C Script_SetMonSeenFlagBySpecies(ctx->fieldSystem, (u16)species); return FALSE; } + +BOOL ScrCmd_Unk0209(ScriptContext *ctx) { //0209 + PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); + (*pokepicManager)->unk00 = 1; + return TRUE; +} + +BOOL ScrCmd_Unk028D(ScriptContext *ctx) { //028D + PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); + (*pokepicManager)->unk00 = 2; + return TRUE; +} + +BOOL ScrCmd_Unk028E(ScriptContext *ctx) { //028E + ctx->data[0] = ScriptReadHalfword(ctx); + SetupNativeScript(ctx, FUN_0203BE9C); + return TRUE; +} + +static BOOL FUN_0203BE9C(ScriptContext *ctx) { + PokepicManager **pokepicManager = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MISC_DATA_PTR); + u16 *var = GetVarPointer(ctx->fieldSystem, ctx->data[0]); //unused + return (*pokepicManager)->unk00 != 3; +} + +BOOL ScrCmd_Unk020A(ScriptContext *ctx) { //020A + u16 unk0 = ScriptReadHalfword(ctx); + MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); + u16 *ptr = GetVarPointer(ctx->fieldSystem, unk0); + MOD05_021E1374(ctx->taskManager, *messageFormat, ptr); + return TRUE; +} + +BOOL ScrCmd_Unk020B(ScriptContext *ctx) { //020B + LocalMapObject **lastInteracted = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); + if (*lastInteracted != NULL) { + MOD05_021E1994(ctx->fieldSystem, *lastInteracted); + } + return FALSE; +} + +BOOL ScrCmd_Unk00A5(ScriptContext *ctx) { //00A5 + FUN_0208A338(ctx->taskManager); + return TRUE; +} diff --git a/arm9/src/scrcmd_13.c b/arm9/src/scrcmd_13.c index 6d22cd2a7..69ab0f7a4 100644 --- a/arm9/src/scrcmd_13.c +++ b/arm9/src/scrcmd_13.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "event_data.h" #include "heap.h" @@ -19,7 +20,7 @@ extern void FUN_0205F224(struct ScriptState* state); extern void FUN_0205F234(struct ScriptState* state); extern void FUN_0208089C(struct Pokemon* pokemon, struct PlayerData* player, u32 a2, u32 a3, u32 heap_id); -THUMB_FUNC BOOL ScrCmd_Unk0253(struct ScriptContext* ctx) //0253 +BOOL ScrCmd_Unk0253(struct ScriptContext* ctx) //0253 { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); u16 unk = ScriptGetVar(ctx); @@ -42,7 +43,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0253(struct ScriptContext* ctx) //0253 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 +BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 { void* unk = FUN_02022528(ctx->fieldSystem->saveBlock2); struct Pokemon* pokemon = AllocMonZeroed(32); @@ -60,7 +61,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0254(struct ScriptContext* ctx) //0254 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 +BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 { void* unk = FUN_02022528(ctx->fieldSystem->saveBlock2); struct PCStorage* pc = GetStoragePCPointer(ctx->fieldSystem->saveBlock2); @@ -85,7 +86,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0255(struct ScriptContext* ctx) //0255 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0256(struct ScriptContext* ctx) //0256 +BOOL ScrCmd_Unk0256(struct ScriptContext* ctx) //0256 { u16 unk = ScriptGetVar(ctx); u16* ret_ptr = GetVarPointer(ctx->fieldSystem, ScriptReadHalfword(ctx)); diff --git a/arm9/src/scrcmd_25.c b/arm9/src/scrcmd_25.c index eb8a8177d..fa29032af 100644 --- a/arm9/src/scrcmd_25.c +++ b/arm9/src/scrcmd_25.c @@ -1,26 +1,27 @@ +#include "global.h" #include "scrcmd.h" -THUMB_FUNC BOOL ScrCmd_Unk023F(struct ScriptContext * ctx) //023F +BOOL ScrCmd_Unk023F(struct ScriptContext * ctx) //023F { #pragma unused(ctx) GF_ASSERT(FALSE); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0240(struct ScriptContext * ctx) //0240 +BOOL ScrCmd_Unk0240(struct ScriptContext * ctx) //0240 { #pragma unused(ctx) GF_ASSERT(FALSE); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0241(struct ScriptContext * ctx) //0241 +BOOL ScrCmd_Unk0241(struct ScriptContext * ctx) //0241 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0242(struct ScriptContext * ctx) //0242 +BOOL ScrCmd_Unk0242(struct ScriptContext * ctx) //0242 { #pragma unused(ctx) return FALSE; diff --git a/arm9/src/scrcmd_amity_square.c b/arm9/src/scrcmd_amity_square.c index 05df564be..0beda9325 100644 --- a/arm9/src/scrcmd_amity_square.c +++ b/arm9/src/scrcmd_amity_square.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "constants/accessories.h" #include "constants/pokemon.h" @@ -98,7 +99,7 @@ static const u16 sAmitySquarePossibleAccessoriesByPokemon[6][10] = { }, }; -THUMB_FUNC BOOL ScrCmd_ClearAmitySquareSteps(struct ScriptContext* ctx) //0215 +BOOL ScrCmd_ClearAmitySquareSteps(struct ScriptContext* ctx) //0215 { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -107,7 +108,7 @@ THUMB_FUNC BOOL ScrCmd_ClearAmitySquareSteps(struct ScriptContext* ctx) //0215 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckAmitySquareSteps(struct ScriptContext* ctx) //0216 +BOOL ScrCmd_CheckAmitySquareSteps(struct ScriptContext* ctx) //0216 { u16* ret_ptr = ScriptGetVarPointer(ctx); struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -116,7 +117,7 @@ THUMB_FUNC BOOL ScrCmd_CheckAmitySquareSteps(struct ScriptContext* ctx) //0216 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetAmitySquareAccessory(struct ScriptContext* ctx) //0217 +BOOL ScrCmd_GetAmitySquareAccessory(struct ScriptContext* ctx) //0217 { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 species = ScriptGetVar(ctx); diff --git a/arm9/src/scrcmd_berry_trees.c b/arm9/src/scrcmd_berry_trees.c index 4788735d8..0407ea8ad 100644 --- a/arm9/src/scrcmd_berry_trees.c +++ b/arm9/src/scrcmd_berry_trees.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "unk_02029FB0.h" @@ -14,7 +15,7 @@ extern void FUN_0204B5A8(struct FieldSystem*, LocalMapObject *berryTree, u16); extern void FUN_0204B9A0(struct FieldSystem*); extern void FUN_0204B4FC(struct FieldSystem*, LocalMapObject *berryTree); -THUMB_FUNC BOOL ScrCmd_GetBerryTreeGrowth(struct ScriptContext* ctx) { //017D +BOOL ScrCmd_GetBerryTreeGrowth(struct ScriptContext* ctx) { //017D u16* ret_ptr = ScriptGetVarPointer(ctx); LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); @@ -23,7 +24,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryTreeGrowth(struct ScriptContext* ctx) { //017D return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetBerryTreeType(struct ScriptContext* ctx) { //017E +BOOL ScrCmd_GetBerryTreeType(struct ScriptContext* ctx) { //017E LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -32,7 +33,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryTreeType(struct ScriptContext* ctx) { //017E return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetBerryTreeMulch(struct ScriptContext* ctx) { //017F +BOOL ScrCmd_GetBerryTreeMulch(struct ScriptContext* ctx) { //017F LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -41,7 +42,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryTreeMulch(struct ScriptContext* ctx) { //017F return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetBerryTreeWater(struct ScriptContext* ctx) { //0180 +BOOL ScrCmd_GetBerryTreeWater(struct ScriptContext* ctx) { //0180 LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -50,7 +51,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryTreeWater(struct ScriptContext* ctx) { //0180 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetBerryTreeAmount(struct ScriptContext* ctx) { //0181 +BOOL ScrCmd_GetBerryTreeAmount(struct ScriptContext* ctx) { //0181 LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -59,7 +60,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryTreeAmount(struct ScriptContext* ctx) { //0181 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx) { //0182 +BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx) { //0182 LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); u16 mulchVal = ScriptGetVar(ctx); @@ -68,7 +69,7 @@ THUMB_FUNC BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx) { //0182 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx) //0183 - todo: PlantBerryTree? +BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx) //0183 - todo: PlantBerryTree? { LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); struct GameStats* gameStats = Save_GameStats_Get(ctx->fieldSystem->saveBlock2); @@ -80,7 +81,7 @@ THUMB_FUNC BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx) //0183 - todo return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) //0184 - todo: SetBerryTreeWater/WaterBerryTree, or just the animation? +BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) //0184 - todo: SetBerryTreeWater/WaterBerryTree, or just the animation? { u16 unk = ScriptReadHalfword(ctx); @@ -100,7 +101,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) //0184 - todo: SetBerr return TRUE; } -THUMB_FUNC BOOL ScrCmd_TakeBerryTreeBerries(struct ScriptContext* ctx) //0185 +BOOL ScrCmd_TakeBerryTreeBerries(struct ScriptContext* ctx) //0185 { struct GameStats* gameStats = Save_GameStats_Get(ctx->fieldSystem->saveBlock2); LocalMapObject **berryTree = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_LAST_INTERACTED); diff --git a/arm9/src/scrcmd_coins.c b/arm9/src/scrcmd_coins.c index fb171e6a9..b977c0787 100644 --- a/arm9/src/scrcmd_coins.c +++ b/arm9/src/scrcmd_coins.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "coins.h" @@ -7,7 +8,7 @@ extern Window *MOD05_021E2950(struct FieldSystem* arg, u8 xVal, u8 yVal); extern void MOD05_021E29B4(Window *coinBox); extern void MOD05_021E29C8(struct FieldSystem *arg, Window *coinBox); -THUMB_FUNC BOOL ScrCmd_ShowCoinBox(struct ScriptContext * ctx) //0075 +BOOL ScrCmd_ShowCoinBox(struct ScriptContext * ctx) //0075 { struct FieldSystem* sav_ptr = ctx->fieldSystem; u16 xVal = ScriptGetVar(ctx); @@ -20,7 +21,7 @@ THUMB_FUNC BOOL ScrCmd_ShowCoinBox(struct ScriptContext * ctx) //0075 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HideCoinBox(struct ScriptContext * ctx) //0076 +BOOL ScrCmd_HideCoinBox(struct ScriptContext * ctx) //0076 { Window **coinBoxPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_COIN_BOX); MOD05_021E29B4(*coinBoxPtr); @@ -28,7 +29,7 @@ THUMB_FUNC BOOL ScrCmd_HideCoinBox(struct ScriptContext * ctx) //0076 return FALSE; } -THUMB_FUNC BOOL ScrCmd_UpdateCoinBox(struct ScriptContext * ctx) //0077 +BOOL ScrCmd_UpdateCoinBox(struct ScriptContext * ctx) //0077 { Window **coinBoxPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_COIN_BOX); MOD05_021E29C8(ctx->fieldSystem, *coinBoxPtr); @@ -36,7 +37,7 @@ THUMB_FUNC BOOL ScrCmd_UpdateCoinBox(struct ScriptContext * ctx) //0077 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetCoins(struct ScriptContext * ctx) //0078 - todo: CheckCoins instead? +BOOL ScrCmd_GetCoins(struct ScriptContext * ctx) //0078 - todo: CheckCoins instead? { u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveBlock2); u16 * ret_ptr = ScriptGetVarPointer(ctx); @@ -46,7 +47,7 @@ THUMB_FUNC BOOL ScrCmd_GetCoins(struct ScriptContext * ctx) //0078 - todo: Check return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveCoins(struct ScriptContext * ctx) //0079 +BOOL ScrCmd_GiveCoins(struct ScriptContext * ctx) //0079 { u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveBlock2); u16 amount = ScriptGetVar(ctx); @@ -56,7 +57,7 @@ THUMB_FUNC BOOL ScrCmd_GiveCoins(struct ScriptContext * ctx) //0079 return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeCoinsImmediate(struct ScriptContext * ctx) //0080 - todo: TakeCoins instead? +BOOL ScrCmd_TakeCoinsImmediate(struct ScriptContext * ctx) //0080 - todo: TakeCoins instead? { u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveBlock2); u16 amount = ScriptGetVar(ctx); @@ -66,7 +67,7 @@ THUMB_FUNC BOOL ScrCmd_TakeCoinsImmediate(struct ScriptContext * ctx) //0080 - t return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeCoinsAddress(struct ScriptContext * ctx) //02A8 - todo: TakeCoinsVar instead? +BOOL ScrCmd_TakeCoinsAddress(struct ScriptContext * ctx) //02A8 - todo: TakeCoinsVar instead? { u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveBlock2); u16 * amount = ScriptGetVarPointer(ctx); @@ -76,7 +77,7 @@ THUMB_FUNC BOOL ScrCmd_TakeCoinsAddress(struct ScriptContext * ctx) //02A8 - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: CanAffordCoins? +BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //0274 - todo: CanAffordCoins? { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); @@ -100,7 +101,7 @@ THUMB_FUNC BOOL ScrCmd_HasEnoughCoinsImmediate(struct ScriptContext * ctx) //027 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasEnoughCoinsAddress(struct ScriptContext * ctx) //02A9 - todo: CanAffordCoinsVar? +BOOL ScrCmd_HasEnoughCoinsAddress(struct ScriptContext * ctx) //02A9 - todo: CanAffordCoinsVar? { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); @@ -124,7 +125,7 @@ THUMB_FUNC BOOL ScrCmd_HasEnoughCoinsAddress(struct ScriptContext * ctx) //02A9 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CanGiveCoins(struct ScriptContext * ctx) //0276 +BOOL ScrCmd_CanGiveCoins(struct ScriptContext * ctx) //0276 { u16 * coins_ptr = Save_PlayerData_GetCoinsAddr(ctx->fieldSystem->saveBlock2); u16 * ret_ptr = ScriptGetVarPointer(ctx); diff --git a/arm9/src/scrcmd_daycare.c b/arm9/src/scrcmd_daycare.c index a5dfb1866..5c6569a8f 100644 --- a/arm9/src/scrcmd_daycare.c +++ b/arm9/src/scrcmd_daycare.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "daycare.h" #include "party.h" @@ -17,7 +18,7 @@ extern u16 MOD05_021ED5C4(struct PlayerParty* party, int idx, MessageFormat *mes extern u16 MOD05_021ED5EC(struct DayCare* daycare); extern u32 MOD05_021ED644(struct DayCare* daycare); -THUMB_FUNC BOOL ScrCmd_GetDaycarePokemonNames(struct ScriptContext* ctx) //016D +BOOL ScrCmd_GetDaycarePokemonNames(struct ScriptContext* ctx) //016D { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -28,7 +29,7 @@ THUMB_FUNC BOOL ScrCmd_GetDaycarePokemonNames(struct ScriptContext* ctx) //016D return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetDaycareStatus(struct ScriptContext* ctx) //016E +BOOL ScrCmd_GetDaycareStatus(struct ScriptContext* ctx) //016E { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct SaveBlock2* sav2 = fieldSystem->saveBlock2; @@ -40,7 +41,7 @@ THUMB_FUNC BOOL ScrCmd_GetDaycareStatus(struct ScriptContext* ctx) //016E return FALSE; } -THUMB_FUNC BOOL ScrCmd_DeleteDaycareEgg(struct ScriptContext* ctx) //01A8 +BOOL ScrCmd_DeleteDaycareEgg(struct ScriptContext* ctx) //01A8 { struct DayCare* daycare = SaveArray_Get(ctx->fieldSystem->saveBlock2, 8); MOD05_021ECD64(daycare); @@ -48,7 +49,7 @@ THUMB_FUNC BOOL ScrCmd_DeleteDaycareEgg(struct ScriptContext* ctx) //01A8 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9 +BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9 { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct DayCare* daycare = SaveArray_Get(fieldSystem->saveBlock2, 8); @@ -61,7 +62,7 @@ THUMB_FUNC BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) //01A9 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx) //01A4 +BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx) //01A4 { struct FieldSystem* fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -76,7 +77,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx) //01A4 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx) //01AA +BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx) //01AA { struct FieldSystem* fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -90,7 +91,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx) //01AA return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetDaycareLevel(struct ScriptContext* ctx) //01AE +BOOL ScrCmd_GetDaycareLevel(struct ScriptContext* ctx) //01AE { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -103,7 +104,7 @@ THUMB_FUNC BOOL ScrCmd_GetDaycareLevel(struct ScriptContext* ctx) //01AE return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx) //01AF +BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx) //01AF { struct FieldSystem* fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -117,7 +118,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx) //01AF return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx) //01B0 +BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx) //01B0 { struct FieldSystem* fieldSystem = ctx->fieldSystem; struct SaveBlock2* sav2 = fieldSystem->saveBlock2; @@ -130,7 +131,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx) //01B0 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01BC(struct ScriptContext* ctx) //01BC +BOOL ScrCmd_Unk01BC(struct ScriptContext* ctx) //01BC { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -145,7 +146,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01BC(struct ScriptContext* ctx) //01BC return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01BE(struct ScriptContext* ctx) //01BE +BOOL ScrCmd_Unk01BE(struct ScriptContext* ctx) //01BE { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -156,7 +157,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01BE(struct ScriptContext* ctx) //01BE return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01BF(struct ScriptContext* ctx) //01BF - todo: SaveEggPID? +BOOL ScrCmd_Unk01BF(struct ScriptContext* ctx) //01BF - todo: SaveEggPID? { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -167,25 +168,25 @@ THUMB_FUNC BOOL ScrCmd_Unk01BF(struct ScriptContext* ctx) //01BF - todo: SaveEgg return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A5(struct ScriptContext* ctx) //01A5 +BOOL ScrCmd_Unk01A5(struct ScriptContext* ctx) //01A5 { u16* unused = ScriptGetVarPointer(ctx); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A6(struct ScriptContext* ctx) //01A6 +BOOL ScrCmd_Unk01A6(struct ScriptContext* ctx) //01A6 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A7(struct ScriptContext* ctx) //01A7 +BOOL ScrCmd_Unk01A7(struct ScriptContext* ctx) //01A7 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01AD(struct ScriptContext* ctx) //01AD +BOOL ScrCmd_Unk01AD(struct ScriptContext* ctx) //01AD { u16* unused = ScriptGetVarPointer(ctx); return FALSE; diff --git a/arm9/src/scrcmd_flags.c b/arm9/src/scrcmd_flags.c index e05779ff6..d8c0caa26 100644 --- a/arm9/src/scrcmd_flags.c +++ b/arm9/src/scrcmd_flags.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "event_data.h" #include "pokedex.h" @@ -28,7 +29,7 @@ const u8 UNK_020F457F[8] = { 0, 1, 2, 3, 4, 5, 6, 7, }; -THUMB_FUNC BOOL ScrCmd_HasSinnohDex(struct ScriptContext* ctx) //0157 +BOOL ScrCmd_HasSinnohDex(struct ScriptContext* ctx) //0157 { struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveBlock2); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -38,7 +39,7 @@ THUMB_FUNC BOOL ScrCmd_HasSinnohDex(struct ScriptContext* ctx) //0157 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx) //0158 +BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx) //0158 { struct Pokedex* pokedex = Save_Pokedex_Get(ctx->fieldSystem->saveBlock2); @@ -47,7 +48,7 @@ THUMB_FUNC BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx) //0158 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx) //0159 +BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx) //0159 { u16* ret_ptr = ScriptGetVarPointer(ctx); void* unk_sav_ptr = FUN_02034E30(ctx->fieldSystem->saveBlock2); @@ -58,7 +59,7 @@ THUMB_FUNC BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx) //0159 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx) //015A +BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx) //015A { void* unk_sav_ptr = FUN_02034E30(ctx->fieldSystem->saveBlock2); void* unk = FUN_02034E20(unk_sav_ptr); @@ -68,7 +69,7 @@ THUMB_FUNC BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx) //015A return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasBadge(struct ScriptContext* ctx) //015B +BOOL ScrCmd_HasBadge(struct ScriptContext* ctx) //015B { u16 badge_no = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -80,7 +81,7 @@ THUMB_FUNC BOOL ScrCmd_HasBadge(struct ScriptContext* ctx) //015B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx) //015C +BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx) //015C { u16 badge_no = ScriptGetVar(ctx); GF_ASSERT(badge_no < 8); @@ -91,7 +92,7 @@ THUMB_FUNC BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx) //015C return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasBag(struct ScriptContext* ctx) //015E +BOOL ScrCmd_HasBag(struct ScriptContext* ctx) //015E { u16* ret_ptr = ScriptGetVarPointer(ctx); struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -101,7 +102,7 @@ THUMB_FUNC BOOL ScrCmd_HasBag(struct ScriptContext* ctx) //015E return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx) //015D - todo: CountBadges? +BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx) //015D - todo: CountBadges? { u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -121,7 +122,7 @@ THUMB_FUNC BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx) //015D - return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) //015F +BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) //015F { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -130,7 +131,7 @@ THUMB_FUNC BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) //015F return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPartner? CheckPartner? +BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPartner? CheckPartner? { u16* ret_ptr = ScriptGetVarPointer(ctx); struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -140,7 +141,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0160(struct ScriptContext* ctx) //0160 - todo: HasPart return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0161(struct ScriptContext* ctx) //0161 - todo: GivePartner? SetPartner? +BOOL ScrCmd_Unk0161(struct ScriptContext* ctx) //0161 - todo: GivePartner? SetPartner? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -149,7 +150,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0161(struct ScriptContext* ctx) //0161 - todo: GivePar return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0162(struct ScriptContext* ctx) //0162 - todo: RemovePartner? ClearPartner? +BOOL ScrCmd_Unk0162(struct ScriptContext* ctx) //0162 - todo: RemovePartner? ClearPartner? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -158,7 +159,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0162(struct ScriptContext* ctx) //0162 - todo: RemoveP return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0163(struct ScriptContext* ctx) //0163 - todo: GetSteps? CheckSteps? GetStepFlag? CheckStepFlag? +BOOL ScrCmd_Unk0163(struct ScriptContext* ctx) //0163 - todo: GetSteps? CheckSteps? GetStepFlag? CheckStepFlag? { u16* ret_ptr = ScriptGetVarPointer(ctx); struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -168,7 +169,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0163(struct ScriptContext* ctx) //0163 - todo: GetStep return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0164(struct ScriptContext* ctx) //0164 - todo: SetStepFlag? +BOOL ScrCmd_Unk0164(struct ScriptContext* ctx) //0164 - todo: SetStepFlag? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -177,7 +178,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0164(struct ScriptContext* ctx) //0164 - todo: SetStep return 0; } -THUMB_FUNC BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) //0165 - todo: ClearStepFlag? +BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) //0165 - todo: ClearStepFlag? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -186,7 +187,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) //0165 - todo: ClearSt return 0; } -THUMB_FUNC BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) //0166 +BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) //0166 { u16* ret_ptr = ScriptGetVarPointer(ctx); struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -196,7 +197,7 @@ THUMB_FUNC BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) //0166 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) //0167 +BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) //0167 { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); @@ -205,7 +206,7 @@ THUMB_FUNC BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) //0167 return 0; } -THUMB_FUNC BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) //01CF - todo: Strength? +BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) //01CF - todo: Strength? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); u8 option = ScriptReadByte(ctx); @@ -231,7 +232,7 @@ THUMB_FUNC BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) //01CF - todo: return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) //01D0 - todo Flash? +BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) //01D0 - todo Flash? { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); u8 option = ScriptReadByte(ctx); @@ -257,7 +258,7 @@ THUMB_FUNC BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) //01D0 - todo Flas return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx) //01D1 - todo: Defog +BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx) //01D1 - todo: Defog { struct ScriptState* state = SaveArray_Flags_Get(ctx->fieldSystem->saveBlock2); u8 option = ScriptReadByte(ctx); diff --git a/arm9/src/scrcmd_fossils.c b/arm9/src/scrcmd_fossils.c index 106684da2..803d4f326 100644 --- a/arm9/src/scrcmd_fossils.c +++ b/arm9/src/scrcmd_fossils.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "bag.h" @@ -11,7 +12,7 @@ const u16 gFossilPokemonMap[7][2] = { { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, }; -THUMB_FUNC BOOL ScrCmd_CountFossils(struct ScriptContext * ctx) //01F1 +BOOL ScrCmd_CountFossils(struct ScriptContext * ctx) //01F1 { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -28,7 +29,7 @@ THUMB_FUNC BOOL ScrCmd_CountFossils(struct ScriptContext * ctx) //01F1 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetFossilPokemon(struct ScriptContext * ctx) //01F4 +BOOL ScrCmd_GetFossilPokemon(struct ScriptContext * ctx) //01F4 { u16 *ret_ptr = ScriptGetVarPointer(ctx); u16 fossilId = ScriptGetVar(ctx); @@ -47,7 +48,7 @@ THUMB_FUNC BOOL ScrCmd_GetFossilPokemon(struct ScriptContext * ctx) //01F4 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetFossilMinimumAmount(struct ScriptContext * ctx) //01F5 +BOOL ScrCmd_GetFossilMinimumAmount(struct ScriptContext * ctx) //01F5 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 * ret_ptr1 = ScriptGetVarPointer(ctx); @@ -73,13 +74,13 @@ THUMB_FUNC BOOL ScrCmd_GetFossilMinimumAmount(struct ScriptContext * ctx) //01F5 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01F2(struct ScriptContext * ctx) //01F2 +BOOL ScrCmd_Unk01F2(struct ScriptContext * ctx) //01F2 { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01F3(struct ScriptContext * ctx) //01F3 +BOOL ScrCmd_Unk01F3(struct ScriptContext * ctx) //01F3 { #pragma unused(ctx) return FALSE; diff --git a/arm9/src/scrcmd_items.c b/arm9/src/scrcmd_items.c index 4e83f59c4..321f85ad7 100644 --- a/arm9/src/scrcmd_items.c +++ b/arm9/src/scrcmd_items.c @@ -1,9 +1,10 @@ +#include "global.h" #include "scrcmd.h" #include "bag.h" extern BOOL FUN_02054CB0(u16 item_id); -THUMB_FUNC BOOL ScrCmd_GiveItem(struct ScriptContext* ctx) //007B +BOOL ScrCmd_GiveItem(struct ScriptContext* ctx) //007B { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -17,7 +18,7 @@ THUMB_FUNC BOOL ScrCmd_GiveItem(struct ScriptContext* ctx) //007B return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeItem(struct ScriptContext* ctx) //007C +BOOL ScrCmd_TakeItem(struct ScriptContext* ctx) //007C { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -31,7 +32,7 @@ THUMB_FUNC BOOL ScrCmd_TakeItem(struct ScriptContext* ctx) //007C return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasSpaceForItem(struct ScriptContext* ctx) //007D +BOOL ScrCmd_HasSpaceForItem(struct ScriptContext* ctx) //007D { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -45,7 +46,7 @@ THUMB_FUNC BOOL ScrCmd_HasSpaceForItem(struct ScriptContext* ctx) //007D return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasItem(struct ScriptContext* ctx) //007E +BOOL ScrCmd_HasItem(struct ScriptContext* ctx) //007E { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -59,7 +60,7 @@ THUMB_FUNC BOOL ScrCmd_HasItem(struct ScriptContext* ctx) //007E return FALSE; } -THUMB_FUNC BOOL ScrCmd_ItemIdIsTMOrHM(struct ScriptContext* ctx) //007F +BOOL ScrCmd_ItemIdIsTMOrHM(struct ScriptContext* ctx) //007F { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -71,7 +72,7 @@ THUMB_FUNC BOOL ScrCmd_ItemIdIsTMOrHM(struct ScriptContext* ctx) //007F return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx) //0080 +BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx) //0080 { struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -83,13 +84,13 @@ THUMB_FUNC BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx) //0080 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0081(struct ScriptContext* ctx) //0081 - todo: DummyGiveItem? +BOOL ScrCmd_Unk0081(struct ScriptContext* ctx) //0081 - todo: DummyGiveItem? { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0082(struct ScriptContext* ctx) //0082 - todo: DummyHasItem? +BOOL ScrCmd_Unk0082(struct ScriptContext* ctx) //0082 - todo: DummyHasItem? { #pragma unused(ctx) return FALSE; diff --git a/arm9/src/scrcmd_mart.c b/arm9/src/scrcmd_mart.c index 8893bbc84..8f06153ef 100644 --- a/arm9/src/scrcmd_mart.c +++ b/arm9/src/scrcmd_mart.c @@ -344,7 +344,7 @@ const u16 *sSealsMartPointers[] = { UNK_020F41B2, }; -THUMB_FUNC BOOL ScrCmd_NormalMart(struct ScriptContext * ctx) //0147 - todo: Pokemart? +BOOL ScrCmd_NormalMart(struct ScriptContext * ctx) //0147 - todo: Pokemart? { u16 whichMart = ScriptGetVar(ctx); s32 param; @@ -398,7 +398,7 @@ THUMB_FUNC BOOL ScrCmd_NormalMart(struct ScriptContext * ctx) //0147 - todo: Pok return TRUE; } -THUMB_FUNC BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx) //0148 +BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx) //0148 { u16 whichMart = ScriptGetVar(ctx); u32 sp0; @@ -413,7 +413,7 @@ THUMB_FUNC BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx) //0148 return TRUE; } -THUMB_FUNC BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx) //0149 +BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx) //0149 { u16 whichMart = ScriptGetVar(ctx); u32 sp0; @@ -427,7 +427,7 @@ THUMB_FUNC BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx) //0149 return TRUE; } -THUMB_FUNC BOOL ScrCmd_SealsMart(struct ScriptContext * ctx) //014A +BOOL ScrCmd_SealsMart(struct ScriptContext * ctx) //014A { u16 whichMart = ScriptGetVar(ctx); @@ -435,7 +435,7 @@ THUMB_FUNC BOOL ScrCmd_SealsMart(struct ScriptContext * ctx) //014A return TRUE; } -THUMB_FUNC BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx) //0257 - todo: Unsure if this is correct, SDSME has it as SprtSave? +BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx) //0257 - todo: Unsure if this is correct, SDSME has it as SprtSave? { FUN_02038AD0(ctx->fieldSystem->taskManager); return TRUE; diff --git a/arm9/src/scrcmd_money.c b/arm9/src/scrcmd_money.c index f98692ae3..d6213a582 100644 --- a/arm9/src/scrcmd_money.c +++ b/arm9/src/scrcmd_money.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "player_data.h" @@ -7,7 +8,7 @@ extern Window *MOD05_021E27E8(struct FieldSystem *fieldSystem, u8 xVal, u8 yVal) extern void MOD05_021E288C(Window *moneyBox); extern void MOD05_021E28A0(struct FieldSystem *fieldSystem, Window *moneyBox); -THUMB_FUNC BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F +BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F { struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(ctx->fieldSystem); struct PlayerData * player = Save_PlayerData_GetProfileAddr(sav2); @@ -18,7 +19,7 @@ THUMB_FUNC BOOL ScrCmd_GiveMoney(struct ScriptContext * ctx) //006F return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMoney? +BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - todo: TakeMoney? { struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(ctx->fieldSystem); struct PlayerData * player = Save_PlayerData_GetProfileAddr(sav2); @@ -29,7 +30,7 @@ THUMB_FUNC BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext * ctx) //0070 - t return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMoneyVar? +BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - todo: TakeMoneyVar? { struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(ctx->fieldSystem); struct PlayerData * player = Save_PlayerData_GetProfileAddr(sav2); @@ -40,7 +41,7 @@ THUMB_FUNC BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext * ctx) //01A3 - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: CanAffordMoney? +BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //0071 - todo: CanAffordMoney? { struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(ctx->fieldSystem); struct PlayerData * player = Save_PlayerData_GetProfileAddr(sav2); @@ -61,7 +62,7 @@ THUMB_FUNC BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext * ctx) //007 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) //01AB - todo: CanAffordMoneyVar? +BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) //01AB - todo: CanAffordMoneyVar? { struct SaveBlock2 * sav2 = ScriptEnvironment_GetSavePtr(ctx->fieldSystem); struct PlayerData * player = Save_PlayerData_GetProfileAddr(sav2); @@ -82,7 +83,7 @@ THUMB_FUNC BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) //01AB return FALSE; } -THUMB_FUNC BOOL ScrCmd_ShowMoneyBox(struct ScriptContext * ctx) //0072 +BOOL ScrCmd_ShowMoneyBox(struct ScriptContext * ctx) //0072 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 xVal = ScriptGetVar(ctx); @@ -94,7 +95,7 @@ THUMB_FUNC BOOL ScrCmd_ShowMoneyBox(struct ScriptContext * ctx) //0072 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HideMoneyBox(struct ScriptContext * ctx) //0073 +BOOL ScrCmd_HideMoneyBox(struct ScriptContext * ctx) //0073 { Window **moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); MOD05_021E288C(*moneyBox); @@ -102,7 +103,7 @@ THUMB_FUNC BOOL ScrCmd_HideMoneyBox(struct ScriptContext * ctx) //0073 return FALSE; } -THUMB_FUNC BOOL ScrCmd_UpdateMoneyBox(struct ScriptContext * ctx) //0074 +BOOL ScrCmd_UpdateMoneyBox(struct ScriptContext * ctx) //0074 { Window **moneyBox = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MONEY_BOX); MOD05_021E28A0(ctx->fieldSystem, *moneyBox); diff --git a/arm9/src/scrcmd_move_relearner.c b/arm9/src/scrcmd_move_relearner.c index 9bb97f6b2..826009214 100644 --- a/arm9/src/scrcmd_move_relearner.c +++ b/arm9/src/scrcmd_move_relearner.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "heap.h" #include "party.h" @@ -11,7 +12,7 @@ extern u8 FUN_02037D5C(struct UnkStruct_02037CF0*); extern void FUN_02038864(struct FieldSystem*, MoveRelearner *moveRelearner); extern BOOL FUN_0203BC04(struct ScriptContext* ctx); -THUMB_FUNC BOOL ScrCmd_Unk01C6(struct ScriptContext* ctx) { //01C6 - todo: MoveInfo? +BOOL ScrCmd_Unk01C6(struct ScriptContext* ctx) { //01C6 - todo: MoveInfo? u16 unk = ScriptGetVar(ctx); struct UnkStruct_02037CF0 **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); *runningAppData = FUN_02037CF0(32, ctx->fieldSystem, (u8)unk); @@ -20,7 +21,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01C6(struct ScriptContext* ctx) { //01C6 - todo: MoveI return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk01C7(struct ScriptContext* ctx) { //01C7 - todo: StoreMove? +BOOL ScrCmd_Unk01C7(struct ScriptContext* ctx) { //01C7 - todo: StoreMove? u16 *ret_ptr = ScriptGetVarPointer(ctx); struct UnkStruct_02037CF0 **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); GF_ASSERT(*runningAppData != NULL); @@ -36,13 +37,13 @@ THUMB_FUNC BOOL ScrCmd_Unk01C7(struct ScriptContext* ctx) { //01C7 - todo: Store return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk021E(struct ScriptContext* ctx) //021E +BOOL ScrCmd_Unk021E(struct ScriptContext* ctx) //021E { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk021F(struct ScriptContext* ctx) { //021F +BOOL ScrCmd_Unk021F(struct ScriptContext* ctx) { //021F u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_idx = ScriptGetVar(ctx); struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveBlock2); @@ -55,7 +56,7 @@ THUMB_FUNC BOOL ScrCmd_Unk021F(struct ScriptContext* ctx) { //021F return FALSE; } -THUMB_FUNC void FUN_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* pokemon, u16 *eligibleMoves) { +void FUN_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* pokemon, u16 *eligibleMoves) { MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); MoveRelearner *moveRelearner = FUN_02088DD8(32); *moveRelearnerPtr = moveRelearner; @@ -74,13 +75,13 @@ THUMB_FUNC void FUN_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* p FreeToHeap(eligibleMoves); } -THUMB_FUNC BOOL ScrCmd_Unk0220(struct ScriptContext* ctx) //0220 +BOOL ScrCmd_Unk0220(struct ScriptContext* ctx) //0220 { #pragma unused(ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0221(struct ScriptContext* ctx) //0221 - todo: RememberMove? +BOOL ScrCmd_Unk0221(struct ScriptContext* ctx) //0221 - todo: RememberMove? { u16 mon_idx = ScriptGetVar(ctx); struct PlayerParty* party = SaveArray_PlayerParty_Get(ctx->fieldSystem->saveBlock2); @@ -91,7 +92,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0221(struct ScriptContext* ctx) //0221 - todo: Remembe return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0224(struct ScriptContext* ctx) //0224 - todo: TeachMove? +BOOL ScrCmd_Unk0224(struct ScriptContext* ctx) //0224 - todo: TeachMove? { u16 mon_idx = ScriptGetVar(ctx); u16 move = ScriptGetVar(ctx); @@ -106,13 +107,13 @@ THUMB_FUNC BOOL ScrCmd_Unk0224(struct ScriptContext* ctx) //0224 - todo: TeachMo return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0222(struct ScriptContext* ctx) //0222 - todo: DummyMoveCmd? +BOOL ScrCmd_Unk0222(struct ScriptContext* ctx) //0222 - todo: DummyMoveCmd? { #pragma unused(ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0223(struct ScriptContext* ctx) //0223 - todo: RememberMoveResponse? - destroys the MoveRelearner - find better name +BOOL ScrCmd_Unk0223(struct ScriptContext* ctx) //0223 - todo: RememberMoveResponse? - destroys the MoveRelearner - find better name { u16 *ret_ptr = ScriptGetVarPointer(ctx); MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); @@ -133,7 +134,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0223(struct ScriptContext* ctx) //0223 - todo: Remembe return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0225(struct ScriptContext* ctx) //0225 - todo: TeachMoveResponse? - destroys the MoveRelearner - find better name +BOOL ScrCmd_Unk0225(struct ScriptContext* ctx) //0225 - todo: TeachMoveResponse? - destroys the MoveRelearner - find better name { u16 *ret_ptr = ScriptGetVarPointer(ctx); MoveRelearner **moveRelearnerPtr = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index 07f21be72..66e7869ec 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -1,3 +1,4 @@ +#include "global.h" #include "event_data.h" #include "itemtool.h" #include "message_format.h" @@ -19,7 +20,7 @@ extern struct PCStorage* GetStoragePCPointer(struct SaveBlock2* sav2); extern u32 FUN_0205F3C0(struct ScriptState* state); extern u32 FUN_02054C14(u32 number); -THUMB_FUNC BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx) //00CD - todo: BufferPlayerName? TextPlayerName? +BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx) //00CD - todo: BufferPlayerName? TextPlayerName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -32,7 +33,7 @@ THUMB_FUNC BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx) //00CD - todo: B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetRivalName(struct ScriptContext* ctx) //00CE - todo: BufferRivalName? TextRivalName? +BOOL ScrCmd_GetRivalName(struct ScriptContext* ctx) //00CE - todo: BufferRivalName? TextRivalName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -43,7 +44,7 @@ THUMB_FUNC BOOL ScrCmd_GetRivalName(struct ScriptContext* ctx) //00CE - todo: Bu return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx) //00CF - todo: BufferFriendName? TextFriendName? +BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx) //00CF - todo: BufferFriendName? TextFriendName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -54,7 +55,7 @@ THUMB_FUNC BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx) //00CF - todo: B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPokemonName(struct ScriptContext* ctx) //00D0 - todo: BufferPartyPokemonName? TextPartyPokemonName? +BOOL ScrCmd_GetPokemonName(struct ScriptContext* ctx) //00D0 - todo: BufferPartyPokemonName? TextPartyPokemonName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -68,7 +69,7 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonName(struct ScriptContext* ctx) //00D0 - todo: return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetItemName(struct ScriptContext* ctx) //00D1 - todo: BufferItemName? TextItemName? +BOOL ScrCmd_GetItemName(struct ScriptContext* ctx) //00D1 - todo: BufferItemName? TextItemName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -80,7 +81,7 @@ THUMB_FUNC BOOL ScrCmd_GetItemName(struct ScriptContext* ctx) //00D1 - todo: Buf return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPocketName(struct ScriptContext* ctx) //00D2 - todo: BufferPocketName? TextPocketName? +BOOL ScrCmd_GetPocketName(struct ScriptContext* ctx) //00D2 - todo: BufferPocketName? TextPocketName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -92,7 +93,7 @@ THUMB_FUNC BOOL ScrCmd_GetPocketName(struct ScriptContext* ctx) //00D2 - todo: B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetTMHMMoveName(struct ScriptContext* ctx) //00D3 - todo: BufferTMHMName? BufferMachineName? TextTMHMName? TextMachineName? +BOOL ScrCmd_GetTMHMMoveName(struct ScriptContext* ctx) //00D3 - todo: BufferTMHMName? BufferMachineName? TextTMHMName? TextMachineName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -105,7 +106,7 @@ THUMB_FUNC BOOL ScrCmd_GetTMHMMoveName(struct ScriptContext* ctx) //00D3 - todo: return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetMoveName(struct ScriptContext* ctx) //00D4 - todo: BufferMoveName? TextMoveName? +BOOL ScrCmd_GetMoveName(struct ScriptContext* ctx) //00D4 - todo: BufferMoveName? TextMoveName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -117,7 +118,7 @@ THUMB_FUNC BOOL ScrCmd_GetMoveName(struct ScriptContext* ctx) //00D4 - todo: Buf return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00D5(struct ScriptContext* ctx) //00D5 - todo: BufferNumber? TextNumber? +BOOL ScrCmd_Unk00D5(struct ScriptContext* ctx) //00D5 - todo: BufferNumber? TextNumber? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -129,7 +130,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00D5(struct ScriptContext* ctx) //00D5 - todo: BufferN return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0280(struct ScriptContext* ctx) //0280 - todo: BufferNumberSpecial? need more info +BOOL ScrCmd_Unk0280(struct ScriptContext* ctx) //0280 - todo: BufferNumberSpecial? need more info { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -146,7 +147,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0280(struct ScriptContext* ctx) //0280 - todo: BufferN return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPokemonNickname(struct ScriptContext* ctx) //00D6 - todo: BufferPartyPokemonNickname? TextPartyPokemonNickname? +BOOL ScrCmd_GetPokemonNickname(struct ScriptContext* ctx) //00D6 - todo: BufferPartyPokemonNickname? TextPartyPokemonNickname? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -160,7 +161,7 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonNickname(struct ScriptContext* ctx) //00D6 - to return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0251(struct ScriptContext* ctx) //0251 - todo: BufferBoxPokemonNickname? TextBoxPokemonNickname? +BOOL ScrCmd_Unk0251(struct ScriptContext* ctx) //0251 - todo: BufferBoxPokemonNickname? TextBoxPokemonNickname? { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct PCStorage* pc = GetStoragePCPointer(fieldSystem->saveBlock2); @@ -176,7 +177,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0251(struct ScriptContext* ctx) //0251 - todo: BufferB return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPoketchAppName(struct ScriptContext* ctx) //00D7 - todo: BufferPoketchAppName? TextPoketchAppName? +BOOL ScrCmd_GetPoketchAppName(struct ScriptContext* ctx) //00D7 - todo: BufferPoketchAppName? TextPoketchAppName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -187,7 +188,7 @@ THUMB_FUNC BOOL ScrCmd_GetPoketchAppName(struct ScriptContext* ctx) //00D7 - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx) //00D8 - todo: BufferTrainerClassName? TextTrainerClassName? +BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx) //00D8 - todo: BufferTrainerClassName? TextTrainerClassName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -198,7 +199,7 @@ THUMB_FUNC BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx) //00D8 - t return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx) //00D9 - todo: BufferPlayerTrainerClassName? TextPlayerTrainerClassName? +BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx) //00D9 - todo: BufferPlayerTrainerClassName? TextPlayerTrainerClassName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct SaveBlock2* sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); @@ -214,7 +215,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx) //00D9 - todo: BufferP return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00DA(struct ScriptContext* ctx) //00DA - todo: BufferPokemonSpeciesName? TextPokemonSpeciesName? +BOOL ScrCmd_Unk00DA(struct ScriptContext* ctx) //00DA - todo: BufferPokemonSpeciesName? TextPokemonSpeciesName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -229,7 +230,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00DA(struct ScriptContext* ctx) //00DA - todo: BufferP return FALSE; } -THUMB_FUNC struct String* FUN_02040AE4(u32 msg_no, u32 heap_id) //todo: GetPokemonSpeciesName? +struct String* FUN_02040AE4(u32 msg_no, u32 heap_id) //todo: GetPokemonSpeciesName? { struct MsgData* msg_data = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_MSGDATA_MSG, 362, heap_id); //todo change to NAIX struct String* ret = NewString_ReadMsgData(msg_data, msg_no); @@ -238,7 +239,7 @@ THUMB_FUNC struct String* FUN_02040AE4(u32 msg_no, u32 heap_id) //todo: GetPokem return ret; } -THUMB_FUNC BOOL ScrCmd_GetPlayerStarterName(struct ScriptContext* ctx) //00DB - todo: BufferPlayerStarterSpecies? +BOOL ScrCmd_GetPlayerStarterName(struct ScriptContext* ctx) //00DB - todo: BufferPlayerStarterSpecies? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -252,7 +253,7 @@ THUMB_FUNC BOOL ScrCmd_GetPlayerStarterName(struct ScriptContext* ctx) //00DB - return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetRivalStarterName(struct ScriptContext* ctx) //00DC - todo: BufferRivalStarterSpecies? +BOOL ScrCmd_GetRivalStarterName(struct ScriptContext* ctx) //00DC - todo: BufferRivalStarterSpecies? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -266,7 +267,7 @@ THUMB_FUNC BOOL ScrCmd_GetRivalStarterName(struct ScriptContext* ctx) //00DC - t return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetCounterpartStarterName(struct ScriptContext* ctx) //00DD - todo: BufferFriendStarterSpecies? +BOOL ScrCmd_GetCounterpartStarterName(struct ScriptContext* ctx) //00DD - todo: BufferFriendStarterSpecies? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -280,7 +281,7 @@ THUMB_FUNC BOOL ScrCmd_GetCounterpartStarterName(struct ScriptContext* ctx) //00 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetDecorationName(struct ScriptContext* ctx) //00DF - todo: BufferDecorationName? +BOOL ScrCmd_GetDecorationName(struct ScriptContext* ctx) //00DF - todo: BufferDecorationName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -291,7 +292,7 @@ THUMB_FUNC BOOL ScrCmd_GetDecorationName(struct ScriptContext* ctx) //00DF - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetUndergroundTrapName(struct ScriptContext* ctx) //00E0 - todo: BufferUndergroundTrapName? +BOOL ScrCmd_GetUndergroundTrapName(struct ScriptContext* ctx) //00E0 - todo: BufferUndergroundTrapName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -302,7 +303,7 @@ THUMB_FUNC BOOL ScrCmd_GetUndergroundTrapName(struct ScriptContext* ctx) //00E0 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx) //00E1 - todo: BufferUndergroundItemName? BufferTreasureName? +BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx) //00E1 - todo: BufferUndergroundItemName? BufferTreasureName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -313,7 +314,7 @@ THUMB_FUNC BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx) //00E1 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetMapName(struct ScriptContext* ctx) //00E2 - todo: BufferMapName? +BOOL ScrCmd_GetMapName(struct ScriptContext* ctx) //00E2 - todo: BufferMapName? { struct String* str = String_New(22, 4); MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -327,7 +328,7 @@ THUMB_FUNC BOOL ScrCmd_GetMapName(struct ScriptContext* ctx) //00E2 - todo: Buff return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetBerryName(struct ScriptContext* ctx) //017B - todo: BufferBerryName? +BOOL ScrCmd_GetBerryName(struct ScriptContext* ctx) //017B - todo: BufferBerryName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -341,7 +342,7 @@ THUMB_FUNC BOOL ScrCmd_GetBerryName(struct ScriptContext* ctx) //017B - todo: Bu return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetNatureName(struct ScriptContext* ctx) //017C - todo: BufferNatureName? +BOOL ScrCmd_GetNatureName(struct ScriptContext* ctx) //017C - todo: BufferNatureName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -352,7 +353,7 @@ THUMB_FUNC BOOL ScrCmd_GetNatureName(struct ScriptContext* ctx) //017C - todo: B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx) //0261 - todo: BufferAccessoryName? +BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx) //0261 - todo: BufferAccessoryName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -363,7 +364,7 @@ THUMB_FUNC BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx) //0261 - todo: return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetWhiteRockInscription(struct ScriptContext* ctx) //0272 - todo: BufferWhiteRockInscription? +BOOL ScrCmd_GetWhiteRockInscription(struct ScriptContext* ctx) //0272 - todo: BufferWhiteRockInscription? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -378,7 +379,7 @@ THUMB_FUNC BOOL ScrCmd_GetWhiteRockInscription(struct ScriptContext* ctx) //0272 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx) //01CB - todo: BufferPartyPokemonMoveName? +BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx) //01CB - todo: BufferPartyPokemonMoveName? { struct FieldSystem *fieldSystem = ctx->fieldSystem; MessageFormat **messageFormat = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); @@ -394,7 +395,7 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx) //01CB - to return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetRibbonName(struct ScriptContext* ctx) //0232 - todo: BufferRibbonName? +BOOL ScrCmd_GetRibbonName(struct ScriptContext* ctx) //0232 - todo: BufferRibbonName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -406,7 +407,7 @@ THUMB_FUNC BOOL ScrCmd_GetRibbonName(struct ScriptContext* ctx) //0232 - todo: B return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSealName(struct ScriptContext* ctx) //02B3 - todo: BufferSealName? +BOOL ScrCmd_GetSealName(struct ScriptContext* ctx) //02B3 - todo: BufferSealName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -417,7 +418,7 @@ THUMB_FUNC BOOL ScrCmd_GetSealName(struct ScriptContext* ctx) //02B3 - todo: Buf return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetItemNameWithIndefArticle(struct ScriptContext* ctx) //02C4 - todo: BufferIndefItemName? +BOOL ScrCmd_GetItemNameWithIndefArticle(struct ScriptContext* ctx) //02C4 - todo: BufferIndefItemName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -428,7 +429,7 @@ THUMB_FUNC BOOL ScrCmd_GetItemNameWithIndefArticle(struct ScriptContext* ctx) // return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetItemNamePlural(struct ScriptContext* ctx) //02C5 - todo: BufferPluralItemName? +BOOL ScrCmd_GetItemNamePlural(struct ScriptContext* ctx) //02C5 - todo: BufferPluralItemName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -439,7 +440,7 @@ THUMB_FUNC BOOL ScrCmd_GetItemNamePlural(struct ScriptContext* ctx) //02C5 - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetDecorationNameWithArticle(struct ScriptContext* ctx) //02C6 - todo: BufferIndefDecorationName? +BOOL ScrCmd_GetDecorationNameWithArticle(struct ScriptContext* ctx) //02C6 - todo: BufferIndefDecorationName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -450,7 +451,7 @@ THUMB_FUNC BOOL ScrCmd_GetDecorationNameWithArticle(struct ScriptContext* ctx) / return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetUndergroundTrapNameWithArticle(struct ScriptContext* ctx) //02C7 - todo: BufferIndefTrapName? +BOOL ScrCmd_GetUndergroundTrapNameWithArticle(struct ScriptContext* ctx) //02C7 - todo: BufferIndefTrapName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -461,7 +462,7 @@ THUMB_FUNC BOOL ScrCmd_GetUndergroundTrapNameWithArticle(struct ScriptContext* c return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetUndergroundItemNameWithArticle(struct ScriptContext* ctx) //02C8 - todo: BufferIndefUndergroundItemName? BufferIndefTreasureName? +BOOL ScrCmd_GetUndergroundItemNameWithArticle(struct ScriptContext* ctx) //02C8 - todo: BufferIndefUndergroundItemName? BufferIndefTreasureName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -472,7 +473,7 @@ THUMB_FUNC BOOL ScrCmd_GetUndergroundItemNameWithArticle(struct ScriptContext* c return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk02C9(struct ScriptContext* ctx) //02C9 - todo: BufferIndefSpeciesName? +BOOL ScrCmd_Unk02C9(struct ScriptContext* ctx) //02C9 - todo: BufferIndefSpeciesName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -485,7 +486,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02C9(struct ScriptContext* ctx) //02C9 - todo: BufferI return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk02CA(struct ScriptContext* ctx) //02CA - todo: BufferIndefFriendStarterSpecies? +BOOL ScrCmd_Unk02CA(struct ScriptContext* ctx) //02CA - todo: BufferIndefFriendStarterSpecies? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -497,7 +498,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02CA(struct ScriptContext* ctx) //02CA - todo: BufferI return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetFashionNameWithArticle(struct ScriptContext* ctx) //02CB - todo: BufferIndefAccessoryName? +BOOL ScrCmd_GetFashionNameWithArticle(struct ScriptContext* ctx) //02CB - todo: BufferIndefAccessoryName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -508,7 +509,7 @@ THUMB_FUNC BOOL ScrCmd_GetFashionNameWithArticle(struct ScriptContext* ctx) //02 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk02CC(struct ScriptContext* ctx) //02CC - todo: BufferIndefTrainerClassName? +BOOL ScrCmd_Unk02CC(struct ScriptContext* ctx) //02CC - todo: BufferIndefTrainerClassName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -519,7 +520,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02CC(struct ScriptContext* ctx) //02CC - todo: BufferI return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx) //02CD - todo: BufferPluralSealName? +BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx) //02CD - todo: BufferPluralSealName? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); @@ -530,7 +531,7 @@ THUMB_FUNC BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx) //02CD - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx) //02CE - todo CapitalizeText? +BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx) //02CE - todo CapitalizeText? { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); diff --git a/arm9/src/scrcmd_party.c b/arm9/src/scrcmd_party.c index 012261795..a9fd6fedc 100644 --- a/arm9/src/scrcmd_party.c +++ b/arm9/src/scrcmd_party.c @@ -1,3 +1,4 @@ +#include "global.h" #include "constants/moves.h" #include "itemtool.h" #include "map_header.h" @@ -13,7 +14,7 @@ extern u16 FUN_02054DEC(struct SaveBlock2* sav2); -THUMB_FUNC BOOL ScrCmd_GiveMon(struct ScriptContext* ctx) //0096 - todo: GivePokemon? +BOOL ScrCmd_GiveMon(struct ScriptContext* ctx) //0096 - todo: GivePokemon? { u32 mapSec = MapHeader_GetMapSec(*(ctx->fieldSystem->mapId)); struct FieldSystem *fieldSystem = ctx->fieldSystem; @@ -26,7 +27,7 @@ THUMB_FUNC BOOL ScrCmd_GiveMon(struct ScriptContext* ctx) //0096 - todo: GivePok return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPartyPokemonSpecies? +BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - todo: GetPartyPokemonSpecies? { u32 species; u16* ret_ptr; @@ -51,7 +52,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx) //0198 - to return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - todo: CheckPartyPokemonTraded? +BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - todo: CheckPartyPokemonTraded? { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct SaveBlock2* sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); @@ -77,7 +78,7 @@ THUMB_FUNC BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx) //0199 - tod return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 +BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 { struct FieldSystem *fieldSystem = ctx->fieldSystem; struct PlayerData* player = Save_PlayerData_GetProfileAddr(fieldSystem->saveBlock2); @@ -101,7 +102,7 @@ THUMB_FUNC BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx) //0097 return FALSE; } -THUMB_FUNC BOOL ScrCmd_SetPartyMonMove(struct ScriptContext* ctx) //0098 - todo: ReplacePartyPokemonMove? +BOOL ScrCmd_SetPartyMonMove(struct ScriptContext* ctx) //0098 - todo: ReplacePartyPokemonMove? { u16 mon_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); @@ -113,7 +114,7 @@ THUMB_FUNC BOOL ScrCmd_SetPartyMonMove(struct ScriptContext* ctx) //0098 - todo: return FALSE; } -THUMB_FUNC BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx) //0099 +BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx) //0099 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -141,7 +142,7 @@ THUMB_FUNC BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx) //0099 return FALSE; } -THUMB_FUNC BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - todo: CheckMoveInParty? +BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - todo: CheckMoveInParty? { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -171,7 +172,7 @@ THUMB_FUNC BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx) //009A - return FALSE; } -THUMB_FUNC BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx) //01F7 +BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx) //01F7 { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); @@ -182,7 +183,7 @@ THUMB_FUNC BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx) //01F7 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) //01F6 +BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) //01F6 { u8 party_count; u8 i; @@ -213,7 +214,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx) / return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx) //0278 +BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx) //0278 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -232,7 +233,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx) //0278 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 +BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -259,7 +260,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx) //0212 return FALSE; } -THUMB_FUNC BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 - todo: CheckNatureInParty +BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 - todo: CheckNatureInParty { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -287,7 +288,7 @@ THUMB_FUNC BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx) //0213 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx) //01B9 +BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx) //01B9 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -299,7 +300,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx) //01B9 return FALSE; } -THUMB_FUNC BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx) //01BA +BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx) //01BA { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 friendship_to_add = ScriptGetVar(ctx); @@ -343,7 +344,7 @@ THUMB_FUNC BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx) //01BA return FALSE; } -THUMB_FUNC BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx) //01BB +BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx) //01BB { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 friendship_to_deplete = ScriptGetVar(ctx); @@ -366,7 +367,7 @@ THUMB_FUNC BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx) //0 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx) //0281 +BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx) //0281 { u16 mon_slot = ScriptGetVar(ctx); u16 contest_condition_id = ScriptGetVar(ctx); @@ -378,7 +379,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx) // return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetLeadingPartyMonSlot(struct ScriptContext* ctx) //0247 +BOOL ScrCmd_GetLeadingPartyMonSlot(struct ScriptContext* ctx) //0247 { u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -386,7 +387,7 @@ THUMB_FUNC BOOL ScrCmd_GetLeadingPartyMonSlot(struct ScriptContext* ctx) //0247 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx) //0248 +BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx) //0248 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* type1 = ScriptGetVarPointer(ctx); @@ -400,7 +401,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx) //0248 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx) //0177 +BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx) //0177 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -410,7 +411,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx) //0177 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A +BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A { u32 non_egg_mons; s32 i; @@ -436,7 +437,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx) //019A return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B +BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx) //019B { u16 slot_to_ignore; s32 party_count; @@ -471,7 +472,7 @@ THUMB_FUNC BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C +BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) //019C { s32 party_count; struct PCStorage* pc; @@ -503,7 +504,7 @@ THUMB_FUNC BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx) / return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D +BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D { s32 party_count; u32 eggs_in_party; @@ -529,7 +530,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx) //019D return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 +BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 { u16 party_count; u16 i; @@ -554,7 +555,7 @@ THUMB_FUNC BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx) //0119 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx) //011A +BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx) //011A { u16 mon_slot = ScriptGetVar(ctx); u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -565,7 +566,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx) //011A return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx) //01C8 +BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx) //01C8 { struct Pokemon* party_mon; u8 moves; @@ -613,7 +614,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx) //01C8 return FALSE; } -THUMB_FUNC BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx) //01C9 +BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx) //01C9 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 mon_slot = ScriptGetVar(ctx); @@ -626,7 +627,7 @@ THUMB_FUNC BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx) //01C9 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx) //01CA +BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx) //01CA { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -639,7 +640,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx) //01CA return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx) //01EE +BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx) //01EE { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -651,7 +652,7 @@ THUMB_FUNC BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx) //01EE return FALSE; } -THUMB_FUNC BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx) //01F0 +BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx) //01F0 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16 mon_slot = ScriptGetVar(ctx); @@ -664,7 +665,7 @@ THUMB_FUNC BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx) //01F0 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 +BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 { struct FieldSystem *fieldSystem = ctx->fieldSystem; u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -692,7 +693,7 @@ THUMB_FUNC BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx) //01C0 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E +BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); @@ -714,7 +715,7 @@ THUMB_FUNC BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx) //022E return FALSE; } -THUMB_FUNC BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F +BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F { struct PlayerParty* party; u16 ribbon_idx; @@ -751,7 +752,7 @@ THUMB_FUNC BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx) //022F return FALSE; } -THUMB_FUNC BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx) //0230 +BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx) //0230 { u16* ret_ptr = ScriptGetVarPointer(ctx); u16 mon_slot = ScriptGetVar(ctx); @@ -763,7 +764,7 @@ THUMB_FUNC BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx) //0230 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx) //0231 +BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx) //0231 { u16 mon_slot = ScriptGetVar(ctx); u16 ribbon_idx = ScriptGetVar(ctx); @@ -776,7 +777,7 @@ THUMB_FUNC BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx) //0231 return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 +BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 { u16 ribbon_idx; @@ -808,7 +809,7 @@ THUMB_FUNC BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx) //02B7 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00A0(struct ScriptContext* ctx) //00A0 - todo: DummyCountPartyPokemon +BOOL ScrCmd_Unk00A0(struct ScriptContext* ctx) //00A0 - todo: DummyCountPartyPokemon { #pragma unused(ctx) return FALSE; diff --git a/arm9/src/scrcmd_prizes.c b/arm9/src/scrcmd_prizes.c index 9cb7dbecb..b21cb5e1c 100644 --- a/arm9/src/scrcmd_prizes.c +++ b/arm9/src/scrcmd_prizes.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "constants/items.h" @@ -23,7 +24,7 @@ const u16 gGameCornerPrizes[19][2] = { { ITEM_TM68, 20000 }, }; -THUMB_FUNC BOOL ScrCmd_GetPrizeItemIdAndCost(struct ScriptContext* ctx) //02A6 +BOOL ScrCmd_GetPrizeItemIdAndCost(struct ScriptContext* ctx) //02A6 { u16 idx = ScriptGetVar(ctx); u16* prize_item_id = ScriptGetVarPointer(ctx); diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c index e70703c1d..e53ab8f57 100644 --- a/arm9/src/scrcmd_sound.c +++ b/arm9/src/scrcmd_sound.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "unk_020040F4.h" #include "sound_chatot.h" @@ -21,7 +22,7 @@ extern BOOL FUN_02005508(u16); extern void FUN_02005578(u16); extern BOOL FUN_02005670(void); -THUMB_FUNC BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx) //02AE +BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx) //02AE { u16 unk0 = ScriptReadHalfword(ctx); u16 *unk1 = ScriptGetVarPointer(ctx); @@ -31,13 +32,13 @@ THUMB_FUNC BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx) //02AE return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayBgm(struct ScriptContext *ctx) //0050 +BOOL ScrCmd_PlayBgm(struct ScriptContext *ctx) //0050 { FUN_0200521C(ScriptReadHalfword(ctx)); return FALSE; } -THUMB_FUNC BOOL ScrCmd_StopBgm(struct ScriptContext *ctx) //0051 +BOOL ScrCmd_StopBgm(struct ScriptContext *ctx) //0051 { ScriptReadHalfword(ctx); u32 unk0 = FUN_02004124(); @@ -45,20 +46,20 @@ THUMB_FUNC BOOL ScrCmd_StopBgm(struct ScriptContext *ctx) //0051 return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayDefaultBgm(struct ScriptContext *ctx) //0052 +BOOL ScrCmd_PlayDefaultBgm(struct ScriptContext *ctx) //0052 { u16 unk0 = FUN_0204ABA8(ctx->fieldSystem, *ctx->fieldSystem->mapId); FUN_0200521C(unk0); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0053(struct ScriptContext *ctx) //0053 - todo: SetMusic? SpecialMusic? +BOOL ScrCmd_Unk0053(struct ScriptContext *ctx) //0053 - todo: SetMusic? SpecialMusic? { FUN_0204AB20(ctx->fieldSystem, ScriptReadHalfword(ctx)); return FALSE; } -THUMB_FUNC BOOL ScrCmd_FadeOutBgm(struct ScriptContext *ctx) //0054 +BOOL ScrCmd_FadeOutBgm(struct ScriptContext *ctx) //0054 { u16 unk1 = ScriptReadHalfword(ctx); u16 unk2 = ScriptReadHalfword(ctx); @@ -69,7 +70,7 @@ THUMB_FUNC BOOL ScrCmd_FadeOutBgm(struct ScriptContext *ctx) //0054 return TRUE; } -THUMB_FUNC BOOL FUN_02041464(struct ScriptContext* ctx) +BOOL FUN_02041464(struct ScriptContext* ctx) { #pragma unused(ctx) @@ -79,7 +80,7 @@ THUMB_FUNC BOOL FUN_02041464(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_FadeInBgm(struct ScriptContext* ctx) //0055 +BOOL ScrCmd_FadeInBgm(struct ScriptContext* ctx) //0055 { u16 unk = ScriptReadHalfword(ctx); @@ -89,7 +90,7 @@ THUMB_FUNC BOOL ScrCmd_FadeInBgm(struct ScriptContext* ctx) //0055 return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0056(struct ScriptContext* ctx) //0056 +BOOL ScrCmd_Unk0056(struct ScriptContext* ctx) //0056 { u8 PtrIndx0 = ScriptReadByte(ctx); @@ -100,13 +101,13 @@ THUMB_FUNC BOOL ScrCmd_Unk0056(struct ScriptContext* ctx) //0056 return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0057(struct ScriptContext* ctx) //0057 - todo: PlayFieldBgm? +BOOL ScrCmd_Unk0057(struct ScriptContext* ctx) //0057 - todo: PlayFieldBgm? { FUN_02005308(4, ScriptReadHalfword(ctx)); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx) //0058 +BOOL ScrCmd_Unk0058(struct ScriptContext* ctx) //0058 { u8 PtrIndx0 = ScriptReadByte(ctx); FUN_020040F4(PtrIndx0); @@ -114,21 +115,21 @@ THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx) //0058 } -THUMB_FUNC BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx) //0049 +BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx) //0049 { u16 sound = ScriptGetVar(ctx); PlaySE(sound); return FALSE; } -THUMB_FUNC BOOL ScrCmd_StopFanfare(struct ScriptContext* ctx) //004A +BOOL ScrCmd_StopFanfare(struct ScriptContext* ctx) //004A { u16 unk = ScriptGetVar(ctx); FUN_020054F0(unk, 0); return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayFanfareWait(struct ScriptContext* ctx) //004B +BOOL ScrCmd_PlayFanfareWait(struct ScriptContext* ctx) //004B { u16 unk = ScriptGetVar(ctx); @@ -138,7 +139,7 @@ THUMB_FUNC BOOL ScrCmd_PlayFanfareWait(struct ScriptContext* ctx) //004B return TRUE; } -THUMB_FUNC BOOL FUN_02041540(struct ScriptContext* ctx) +BOOL FUN_02041540(struct ScriptContext* ctx) { if(!FUN_02005508((u16)ctx->data[0])) return TRUE; @@ -146,7 +147,7 @@ THUMB_FUNC BOOL FUN_02041540(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayCry(struct ScriptContext* ctx) //004C +BOOL ScrCmd_PlayCry(struct ScriptContext* ctx) //004C { u16 unk0 = ScriptGetVar(ctx); u16 unused = ScriptGetVar(ctx); @@ -154,13 +155,13 @@ THUMB_FUNC BOOL ScrCmd_PlayCry(struct ScriptContext* ctx) //004C return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayCryWait(struct ScriptContext* ctx) //004D +BOOL ScrCmd_PlayCryWait(struct ScriptContext* ctx) //004D { SetupNativeScript(ctx, FUN_02041598); return TRUE; } -THUMB_FUNC BOOL FUN_02041598(struct ScriptContext* ctx) +BOOL FUN_02041598(struct ScriptContext* ctx) { #pragma unused(ctx) @@ -170,7 +171,7 @@ THUMB_FUNC BOOL FUN_02041598(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlaySound(struct ScriptContext* ctx) //004E +BOOL ScrCmd_PlaySound(struct ScriptContext* ctx) //004E { u16 bgm_id = ScriptReadHalfword(ctx); PlaySound(bgm_id); @@ -178,13 +179,13 @@ THUMB_FUNC BOOL ScrCmd_PlaySound(struct ScriptContext* ctx) //004E return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlaySoundWait(struct ScriptContext* ctx) //004F +BOOL ScrCmd_PlaySoundWait(struct ScriptContext* ctx) //004F { SetupNativeScript(ctx, FUN_020415CC); return TRUE; } -THUMB_FUNC BOOL FUN_020415CC(struct ScriptContext* ctx) +BOOL FUN_020415CC(struct ScriptContext* ctx) { #pragma unused(ctx) if (!FUN_02005CBC()) @@ -193,7 +194,7 @@ THUMB_FUNC BOOL FUN_020415CC(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_CheckChatotCry(struct ScriptContext* ctx) //0059 +BOOL ScrCmd_CheckChatotCry(struct ScriptContext* ctx) //0059 { u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -210,7 +211,7 @@ THUMB_FUNC BOOL ScrCmd_CheckChatotCry(struct ScriptContext* ctx) //0059 } } -THUMB_FUNC BOOL ScrCmd_StartChatotRecord(struct ScriptContext* ctx) //005A +BOOL ScrCmd_StartChatotRecord(struct ScriptContext* ctx) //005A { u16* ret_ptr = ScriptGetVarPointer(ctx); @@ -226,14 +227,14 @@ THUMB_FUNC BOOL ScrCmd_StartChatotRecord(struct ScriptContext* ctx) //005A } } -THUMB_FUNC BOOL ScrCmd_StopChatotRecord(struct ScriptContext* ctx) //005B +BOOL ScrCmd_StopChatotRecord(struct ScriptContext* ctx) //005B { #pragma unused(ctx) Chatot_stopRecording(); return TRUE; } -THUMB_FUNC BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx) //005C +BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx) //005C { struct SaveChatotSoundClip* chatotSoundClip = Save_Chatot_Get(ctx->fieldSystem->saveBlock2); Chatot_saveRecording(chatotSoundClip); @@ -241,14 +242,14 @@ THUMB_FUNC BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx) //005C return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk005D(struct ScriptContext* ctx) //005D - todo: LoadSpearPillarAudio? +BOOL ScrCmd_Unk005D(struct ScriptContext* ctx) //005D - todo: LoadSpearPillarAudio? { #pragma unused(ctx) FUN_0200433C(0x3F, 0, 0); return TRUE; } -THUMB_FUNC BOOL ScrCmd_SetVolume(struct ScriptContext* ctx) //0283 +BOOL ScrCmd_SetVolume(struct ScriptContext* ctx) //0283 { u16 unk1 = ScriptGetVar(ctx); u16 unk2 = ScriptGetVar(ctx); diff --git a/arm9/src/scrcmd_underground.c b/arm9/src/scrcmd_underground.c index 31bc8fbc9..bdc3b8b7f 100644 --- a/arm9/src/scrcmd_underground.c +++ b/arm9/src/scrcmd_underground.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" extern BOOL FUN_02025D6C(void*, u16); @@ -8,7 +9,7 @@ extern BOOL FUN_020260C4(void*, u16, u16); /* Given the amount of dummy functions in this file, I believe this is a debug file of some kind */ -THUMB_FUNC BOOL ScrCmd_GiveSecretBaseDecoration(struct ScriptContext* ctx) //0083 +BOOL ScrCmd_GiveSecretBaseDecoration(struct ScriptContext* ctx) //0083 { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16 unk1 = ScriptGetVar(ctx); @@ -21,7 +22,7 @@ THUMB_FUNC BOOL ScrCmd_GiveSecretBaseDecoration(struct ScriptContext* ctx) //008 return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeSecretBaseDecoration(struct ScriptContext* ctx) //0084 +BOOL ScrCmd_TakeSecretBaseDecoration(struct ScriptContext* ctx) //0084 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -30,7 +31,7 @@ THUMB_FUNC BOOL ScrCmd_TakeSecretBaseDecoration(struct ScriptContext* ctx) //008 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasSpaceForDecoration(struct ScriptContext* ctx) //0085 +BOOL ScrCmd_HasSpaceForDecoration(struct ScriptContext* ctx) //0085 { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16 unk1 = ScriptGetVar(ctx); @@ -43,7 +44,7 @@ THUMB_FUNC BOOL ScrCmd_HasSpaceForDecoration(struct ScriptContext* ctx) //0085 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetDecorationCount(struct ScriptContext* ctx) //0086 - somewhat unsure on name, was originally CheckGoods +BOOL ScrCmd_GetDecorationCount(struct ScriptContext* ctx) //0086 - somewhat unsure on name, was originally CheckGoods { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -52,7 +53,7 @@ THUMB_FUNC BOOL ScrCmd_GetDecorationCount(struct ScriptContext* ctx) //0086 - so return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveUndergroundTrap(struct ScriptContext* ctx) //0087 +BOOL ScrCmd_GiveUndergroundTrap(struct ScriptContext* ctx) //0087 { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16 unk1 = ScriptGetVar(ctx); @@ -65,7 +66,7 @@ THUMB_FUNC BOOL ScrCmd_GiveUndergroundTrap(struct ScriptContext* ctx) //0087 return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeUndergroundTrap(struct ScriptContext* ctx) //0088 +BOOL ScrCmd_TakeUndergroundTrap(struct ScriptContext* ctx) //0088 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -74,7 +75,7 @@ THUMB_FUNC BOOL ScrCmd_TakeUndergroundTrap(struct ScriptContext* ctx) //0088 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasSpaceForTrap(struct ScriptContext* ctx) //0089 +BOOL ScrCmd_HasSpaceForTrap(struct ScriptContext* ctx) //0089 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -83,7 +84,7 @@ THUMB_FUNC BOOL ScrCmd_HasSpaceForTrap(struct ScriptContext* ctx) //0089 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetTrapCount(struct ScriptContext* ctx) //008A +BOOL ScrCmd_GetTrapCount(struct ScriptContext* ctx) //008A { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -92,7 +93,7 @@ THUMB_FUNC BOOL ScrCmd_GetTrapCount(struct ScriptContext* ctx) //008A return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveTreasure(struct ScriptContext* ctx) //008B +BOOL ScrCmd_GiveTreasure(struct ScriptContext* ctx) //008B { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16 unused1 = ScriptGetVar(ctx); @@ -103,7 +104,7 @@ THUMB_FUNC BOOL ScrCmd_GiveTreasure(struct ScriptContext* ctx) //008B return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeTreasure(struct ScriptContext* ctx) //008C +BOOL ScrCmd_TakeTreasure(struct ScriptContext* ctx) //008C { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -112,7 +113,7 @@ THUMB_FUNC BOOL ScrCmd_TakeTreasure(struct ScriptContext* ctx) //008C return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasSpaceForTreasure(struct ScriptContext* ctx) //008D +BOOL ScrCmd_HasSpaceForTreasure(struct ScriptContext* ctx) //008D { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -121,7 +122,7 @@ THUMB_FUNC BOOL ScrCmd_HasSpaceForTreasure(struct ScriptContext* ctx) //008D return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetTreasureCount(struct ScriptContext* ctx) //008E +BOOL ScrCmd_GetTreasureCount(struct ScriptContext* ctx) //008E { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -130,7 +131,7 @@ THUMB_FUNC BOOL ScrCmd_GetTreasureCount(struct ScriptContext* ctx) //008E return FALSE; } -THUMB_FUNC BOOL ScrCmd_GiveUndergroundSphere(struct ScriptContext* ctx) //008F +BOOL ScrCmd_GiveUndergroundSphere(struct ScriptContext* ctx) //008F { struct SaveBlock2* sav2 = ctx->fieldSystem->saveBlock2; u16 unk1 = ScriptGetVar(ctx); @@ -143,7 +144,7 @@ THUMB_FUNC BOOL ScrCmd_GiveUndergroundSphere(struct ScriptContext* ctx) //008F return FALSE; } -THUMB_FUNC BOOL ScrCmd_TakeUndergroundSphere(struct ScriptContext* ctx) //0090 +BOOL ScrCmd_TakeUndergroundSphere(struct ScriptContext* ctx) //0090 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -152,7 +153,7 @@ THUMB_FUNC BOOL ScrCmd_TakeUndergroundSphere(struct ScriptContext* ctx) //0090 return FALSE; } -THUMB_FUNC BOOL ScrCmd_HasSpaceForSphere(struct ScriptContext* ctx) //0091 +BOOL ScrCmd_HasSpaceForSphere(struct ScriptContext* ctx) //0091 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); @@ -161,7 +162,7 @@ THUMB_FUNC BOOL ScrCmd_HasSpaceForSphere(struct ScriptContext* ctx) //0091 return FALSE; } -THUMB_FUNC BOOL ScrCmd_GetSphereCount(struct ScriptContext* ctx) //0092 +BOOL ScrCmd_GetSphereCount(struct ScriptContext* ctx) //0092 { u16 unused1 = ScriptGetVar(ctx); u16 unused2 = ScriptGetVar(ctx); diff --git a/arm9/src/scrcmd_union.c b/arm9/src/scrcmd_union.c index c8b1edb69..aa8a39810 100644 --- a/arm9/src/scrcmd_union.c +++ b/arm9/src/scrcmd_union.c @@ -1,3 +1,4 @@ +#include "global.h" #include "scrcmd.h" #include "message_format.h" #include "math_util.h" @@ -9,7 +10,7 @@ extern void FUN_020385CC(struct TaskManager *, u32, u32, u32, u32, u16*, u16* re extern BOOL FUN_020612EC(struct FieldSystem*); extern BOOL FUN_020612F8(struct FieldSystem*); -THUMB_FUNC BOOL ScrCmd_UnionGroup(struct ScriptContext* ctx) //021D +BOOL ScrCmd_UnionGroup(struct ScriptContext* ctx) //021D { MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); struct UnkSaveStruct_020286F8* unk_sav_ptr = FUN_0202881C(ctx->fieldSystem->saveBlock2); diff --git a/arm9/src/script.c b/arm9/src/script.c index b30f85294..4d90ad107 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -1,6 +1,7 @@ +#include "global.h" #include "script.h" -THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount) +void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount) { int i; @@ -20,31 +21,31 @@ THUMB_FUNC void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 ctx->taskManager = NULL; } -THUMB_FUNC u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr) +u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr) { ctx->scriptPtr = ptr; ctx->mode = 1; return 1; } -THUMB_FUNC void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *)) +void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *)) { ctx->mode = 2; ctx->nativePtr = ptr; } -THUMB_FUNC void StopScript(struct ScriptContext *ctx) +void StopScript(struct ScriptContext *ctx) { ctx->mode = 0; ctx->scriptPtr = 0; } -THUMB_FUNC void FUN_02038B6C(struct ScriptContext *ctx, struct TaskManager *taskManager) +void FUN_02038B6C(struct ScriptContext *ctx, struct TaskManager *taskManager) { ctx->taskManager = taskManager; } -THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx) +u8 RunScriptCommand(struct ScriptContext *ctx) { if (ctx->mode == 0) return FALSE; @@ -91,7 +92,7 @@ THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr) +u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr) { if (ctx->stackDepth + 1 >= 20) { @@ -105,7 +106,7 @@ THUMB_FUNC u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr) } } -THUMB_FUNC const u8 *ScriptPop(struct ScriptContext *ctx) +const u8 *ScriptPop(struct ScriptContext *ctx) { if (ctx->stackDepth == 0) return NULL; @@ -114,31 +115,31 @@ THUMB_FUNC const u8 *ScriptPop(struct ScriptContext *ctx) return ctx->stack[ctx->stackDepth]; } -THUMB_FUNC void ScriptJump(struct ScriptContext *ctx, const u8 *ptr) +void ScriptJump(struct ScriptContext *ctx, const u8 *ptr) { ctx->scriptPtr = ptr; } -THUMB_FUNC u8 ScriptCall(struct ScriptContext *ctx, const u8 *ptr) +u8 ScriptCall(struct ScriptContext *ctx, const u8 *ptr) { u8 ret = ScriptPush(ctx, ctx->scriptPtr); ctx->scriptPtr = ptr; return ret; } -THUMB_FUNC void ScriptReturn(struct ScriptContext *ctx) +void ScriptReturn(struct ScriptContext *ctx) { ctx->scriptPtr = ScriptPop(ctx); } -THUMB_FUNC u16 ScriptReadHalfword(struct ScriptContext *ctx) +u16 ScriptReadHalfword(struct ScriptContext *ctx) { u16 value = *(ctx->scriptPtr++); value += *(ctx->scriptPtr++) << 8; return value; } -THUMB_FUNC u32 ScriptReadWord(struct ScriptContext *ctx) +u32 ScriptReadWord(struct ScriptContext *ctx) { u32 value0 = *(ctx->scriptPtr++); u32 value1 = *(ctx->scriptPtr++); diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index 597e86b4a..2f23ca68d 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -11,8 +11,6 @@ #include "constants/items.h" #include "constants/script_pokemon_util.h" -#pragma thumb on - BOOL MonNotFaintedOrEgg(struct Pokemon * pokemon) { if (GetMonData(pokemon, MON_DATA_HP, NULL) == 0) diff --git a/arm9/src/seal_case.c b/arm9/src/seal_case.c index d4ad2bf82..67f56a740 100644 --- a/arm9/src/seal_case.c +++ b/arm9/src/seal_case.c @@ -3,8 +3,6 @@ #include "MI_memory.h" #include "seal.h" -#pragma thumb on - u32 Save_SealCase_sizeof(void) { return sizeof(struct SealCase); diff --git a/arm9/src/sound.c b/arm9/src/sound.c index 210aec2e3..b3712094f 100644 --- a/arm9/src/sound.c +++ b/arm9/src/sound.c @@ -5,8 +5,6 @@ #include "unk_020040F4.h" #include "sound_chatot.h" -#pragma thumb on - static struct SoundData sSoundDataBuffer; static u32 UNK_02107070; static u32 UNK_02107074; diff --git a/arm9/src/sound_chatot.c b/arm9/src/sound_chatot.c index 5f8d3691b..2254cbdef 100644 --- a/arm9/src/sound_chatot.c +++ b/arm9/src/sound_chatot.c @@ -8,7 +8,7 @@ #include "unk_020040F4.h" #include "unk_020051F4.h" -THUMB_FUNC BOOL FUN_02005CFC(void) +BOOL FUN_02005CFC(void) { if (*(u8 *)FUN_02003D38(29) == 1 && FUN_02004ABC(14) == 0) { @@ -20,7 +20,7 @@ THUMB_FUNC BOOL FUN_02005CFC(void) return FALSE; } -THUMB_FUNC BOOL Chatot_checkCry(struct SaveChatotSoundClip *param0) +BOOL Chatot_checkCry(struct SaveChatotSoundClip *param0) { u8 *r4 = FUN_02003D38(30); @@ -37,7 +37,7 @@ THUMB_FUNC BOOL Chatot_checkCry(struct SaveChatotSoundClip *param0) return FALSE; } -THUMB_FUNC u32 FUN_02005D48(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3) +u32 FUN_02005D48(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3) { #pragma unused(param1) @@ -77,7 +77,7 @@ THUMB_FUNC u32 FUN_02005D48(struct SaveChatotSoundClip *param0, u32 param1, s32 return res; } -THUMB_FUNC void FUN_02005DFC(void) +void FUN_02005DFC(void) { u8 *r5 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(29); @@ -91,7 +91,7 @@ THUMB_FUNC void FUN_02005DFC(void) *r4 = 0; } -THUMB_FUNC u32 Chatot_startRecording(void) +u32 Chatot_startRecording(void) { struct MIC_SamplingData st0; @@ -110,22 +110,22 @@ THUMB_FUNC u32 Chatot_startRecording(void) return GF_MIC_StartAutoSampling(&st0); } -THUMB_FUNC void Chatot_stopRecording(void) +void Chatot_stopRecording(void) { GF_MIC_StopAutoSampling(); } -THUMB_FUNC void Chatot_saveRecording(struct SaveChatotSoundClip *param0) +void Chatot_saveRecording(struct SaveChatotSoundClip *param0) { Chatot_Encode(param0, FUN_02004DB4()); } -THUMB_FUNC void FUN_02005E80(u8 param0) +void FUN_02005E80(u8 param0) { *(u8 *)FUN_02003D38(30) = param0; } -THUMB_FUNC void FUN_02005E90(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3) +void FUN_02005E90(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3) { struct SaveChatotSoundClip **r0 = FUN_02003D38(35); u32 ret; @@ -145,7 +145,7 @@ THUMB_FUNC void FUN_02005E90(struct SaveChatotSoundClip *param0, u32 param1, s32 } } -THUMB_FUNC u32 FUN_02005EE0(struct SaveChatotSoundClip *param0) +u32 FUN_02005EE0(struct SaveChatotSoundClip *param0) { if (!Chatot_Exists(param0)) { @@ -165,7 +165,7 @@ THUMB_FUNC u32 FUN_02005EE0(struct SaveChatotSoundClip *param0) return 0; } -THUMB_FUNC BOOL FUN_02005F14(s32 param0) +BOOL FUN_02005F14(s32 param0) { switch (param0) { diff --git a/arm9/src/string_control_code.c b/arm9/src/string_control_code.c index 14b49be67..e33704d1a 100644 --- a/arm9/src/string_control_code.c +++ b/arm9/src/string_control_code.c @@ -1,8 +1,6 @@ #include "global.h" #include "string_control_code.h" -#pragma thumb on - const u16 * MsgArray_SkipControlCode(const u16 * r4) { GF_ASSERT(*r4 == 0xFFFE); diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c index 46925422e..b42de2708 100644 --- a/arm9/src/string_util.c +++ b/arm9/src/string_util.c @@ -1,3 +1,4 @@ +#include "global.h" #include "string_util.h" const u16 gDigitTable[] = { @@ -32,7 +33,7 @@ const s32 gPowersOfTen[] = { 1000000000, }; -THUMB_FUNC void CopyU16StringArray(u16 *dest, const u16 *src) +void CopyU16StringArray(u16 *dest, const u16 *src) { u16 c = *src; while (c != EOS) { @@ -44,7 +45,7 @@ THUMB_FUNC void CopyU16StringArray(u16 *dest, const u16 *src) *dest = EOS; } -THUMB_FUNC u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 num) +u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 num) { u32 copied = 0; if (num > copied) { @@ -60,7 +61,7 @@ THUMB_FUNC u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 num) return dest + num; } -THUMB_FUNC u32 StringLength(const u16 *s) +u32 StringLength(const u16 *s) { u16 c = *s; u32 len = 0; @@ -72,7 +73,7 @@ THUMB_FUNC u32 StringLength(const u16 *s) return len; } -THUMB_FUNC BOOL StringNotEqual(const u16 *s1, const u16 *s2) +BOOL StringNotEqual(const u16 *s1, const u16 *s2) { for (; *s1 == *s2; s1++, s2++) { if (*s1 == EOS) @@ -81,7 +82,7 @@ THUMB_FUNC BOOL StringNotEqual(const u16 *s1, const u16 *s2) return TRUE; } -THUMB_FUNC BOOL StringNotEqualN(const u16 *s1, const u16 *s2, u32 num) +BOOL StringNotEqualN(const u16 *s1, const u16 *s2, u32 num) { u16 c1, c2; c2 = *s2; @@ -102,7 +103,7 @@ THUMB_FUNC BOOL StringNotEqualN(const u16 *s1, const u16 *s2, u32 num) return TRUE; } -THUMB_FUNC u16 *StringFill(u16 *dest, u16 value, u32 num) +u16 *StringFill(u16 *dest, u16 value, u32 num) { u32 copied = 0; if (num > copied) { @@ -116,12 +117,12 @@ THUMB_FUNC u16 *StringFill(u16 *dest, u16 value, u32 num) return dest + copied; } -THUMB_FUNC u16 *StringFillEOS(u16 *dest, u32 num) +u16 *StringFillEOS(u16 *dest, u32 num) { return StringFill(dest, EOS, num); } -THUMB_FUNC u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n) +u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n) { for (u32 x = (u32)gPowersOfTen[n - 1]; x != 0; x = x / 10) { u16 res = (u16)(value / x); diff --git a/arm9/src/task.c b/arm9/src/task.c index 0df77f8ab..1499b3aae 100644 --- a/arm9/src/task.c +++ b/arm9/src/task.c @@ -2,8 +2,6 @@ #include "task.h" #include "heap.h" -#pragma thumb on - struct TaskManager *FieldSys_CreateTask(struct FieldSystem * fieldSystem, TaskFunc taskFunc, void *env) { struct TaskManager *taskManager = AllocFromHeapAtEnd(32, sizeof(struct TaskManager)); diff --git a/arm9/src/text.c b/arm9/src/text.c index 4028df21e..a2ac3e17a 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -1,3 +1,4 @@ +#include "global.h" #include "text.h" #include "MI_memory.h" #include "filesystem.h" @@ -25,12 +26,12 @@ extern void FUN_0201C1A8(struct TextPrinter *printer); extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); -THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts) +void SetFontsPointer(const struct FontInfo *fonts) { gFonts = fonts; } -THUMB_FUNC u8 FUN_0201BCC8(void (*func)(u32, void *), void *printer, u32 param2) +u8 FUN_0201BCC8(void (*func)(u32, void *), void *printer, u32 param2) { u32 *r4 = UNK_021C5714; s32 i; @@ -51,7 +52,7 @@ THUMB_FUNC u8 FUN_0201BCC8(void (*func)(u32, void *), void *printer, u32 param2) return (u8)i; } -THUMB_FUNC void FUN_0201BCFC(u8 textPrinterNumber) +void FUN_0201BCFC(u8 textPrinterNumber) { GF_ASSERT(textPrinterNumber < 8); GF_ASSERT(UNK_021C5714[textPrinterNumber] != 0); @@ -73,12 +74,12 @@ THUMB_FUNC void FUN_0201BCFC(u8 textPrinterNumber) UNK_021C5714[textPrinterNumber] = 0; } -THUMB_FUNC BOOL FUN_0201BD44(u8 textPrinterNumber) +BOOL FUN_0201BD44(u8 textPrinterNumber) { return UNK_021C5714[textPrinterNumber] ? TRUE : FALSE; } -THUMB_FUNC void ResetAllTextPrinters(void) +void ResetAllTextPrinters(void) { for (s32 i = 0; i < 8; i++) { @@ -86,17 +87,17 @@ THUMB_FUNC void ResetAllTextPrinters(void) } } -THUMB_FUNC u8 FUN_0201BD70(u8 textPrinterNumber) +u8 FUN_0201BD70(u8 textPrinterNumber) { return (u8)FUN_0201BD44(textPrinterNumber); } -THUMB_FUNC void FUN_0201BD7C(u8 textPrinterNumber) +void FUN_0201BD7C(u8 textPrinterNumber) { FUN_0201BCFC(textPrinterNumber); } -THUMB_FUNC u16 AddTextPrinterParameterized(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16)) +u16 AddTextPrinterParameterized(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16)) { struct TextPrinterTemplate printerTemplate; @@ -119,7 +120,7 @@ THUMB_FUNC u16 AddTextPrinterParameterized(struct Window * window, u8 fontId, st return AddTextPrinter(&printerTemplate, speed, callback); } -THUMB_FUNC u16 AddTextPrinterParameterized2(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u8 (*callback)(struct TextPrinterTemplate *, u16)) +u16 AddTextPrinterParameterized2(struct Window * window, u8 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u8 (*callback)(struct TextPrinterTemplate *, u16)) { struct TextPrinterTemplate printerTemplate; @@ -142,7 +143,7 @@ THUMB_FUNC u16 AddTextPrinterParameterized2(struct Window * window, u8 fontId, s return AddTextPrinter(&printerTemplate, speed, callback); } -THUMB_FUNC u16 AddTextPrinterParameterized3(struct Window * window, u32 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, u8 (*callback)(struct TextPrinterTemplate *, u16)) +u16 AddTextPrinterParameterized3(struct Window * window, u32 fontId, struct String *str, u32 x, u32 y, u32 speed, u32 colors, u32 letterSpacing, u32 lineSpacing, u8 (*callback)(struct TextPrinterTemplate *, u16)) { struct TextPrinterTemplate printerTemplate; @@ -165,7 +166,7 @@ THUMB_FUNC u16 AddTextPrinterParameterized3(struct Window * window, u32 fontId, return AddTextPrinter(&printerTemplate, speed, callback); } -THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16)) +u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (*callback)(struct TextPrinterTemplate *, u16)) { if (!gFonts) return 0xff; @@ -219,7 +220,7 @@ THUMB_FUNC u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 s } } -THUMB_FUNC void RunTextPrinter(u32 param0, struct TextPrinter *printer) +void RunTextPrinter(u32 param0, struct TextPrinter *printer) { #pragma unused(param0) if (UNK_021C570C == 0) @@ -255,7 +256,7 @@ THUMB_FUNC void RunTextPrinter(u32 param0, struct TextPrinter *printer) } } -THUMB_FUNC u32 RenderFont(struct TextPrinter *printer) +u32 RenderFont(struct TextPrinter *printer) { u32 ret; while (TRUE) @@ -268,7 +269,7 @@ THUMB_FUNC u32 RenderFont(struct TextPrinter *printer) } } -THUMB_FUNC void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) +void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) { s32 r5 = 0; u32 sp20[4]; @@ -302,7 +303,7 @@ THUMB_FUNC void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadow } } -THUMB_FUNC void DecompressGlyphTile(const u16 *src, u16 *dst) +void DecompressGlyphTile(const u16 *src, u16 *dst) { dst[0] = sFontHalfRowLookupTable[(u32)src[0] >> 8]; dst[1] = sFontHalfRowLookupTable[(u8)src[0]]; @@ -322,12 +323,12 @@ THUMB_FUNC void DecompressGlyphTile(const u16 *src, u16 *dst) dst[15] = sFontHalfRowLookupTable[(u8)src[7]]; } -THUMB_FUNC void FUN_0201C1A8(struct TextPrinter *printer) +void FUN_0201C1A8(struct TextPrinter *printer) { printer->Unk2C = NULL; } -THUMB_FUNC u16 *FUN_0201C1B0(void) +u16 *FUN_0201C1B0(void) { void *res = AllocFromHeap(0, 32 * 24 * sizeof(u16)); struct UnkStruct_0200B870_sub * var; @@ -337,7 +338,7 @@ THUMB_FUNC u16 *FUN_0201C1B0(void) return res; } -THUMB_FUNC void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2, u32 param3) +void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2, u32 param3) { #pragma unused (param1, param2) struct Window * window = printer->printerTemplate.window; @@ -350,7 +351,7 @@ THUMB_FUNC void FUN_0201C1EC(struct TextPrinter *printer, u32 param1, u32 param2 BlitBitmapRectToWindow(window, r6, 0, 0, 24, 32, r2, 0, 24, 32); } -THUMB_FUNC void FUN_0201C238(struct TextPrinter *printer) +void FUN_0201C238(struct TextPrinter *printer) { if (printer->Unk2C == NULL) { diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index fdb84a2d2..cc5e749c6 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -1,3 +1,4 @@ +#include "global.h" #include "text_02054590.h" #include "text.h" #include "bg_window.h" @@ -5,7 +6,7 @@ #include "render_text.h" #include "render_window.h" -THUMB_FUNC void FUN_02054590(enum GFPalLoadLocation location, u32 param1) +void FUN_02054590(enum GFPalLoadLocation location, u32 param1) { if (param1 == 1) { @@ -15,7 +16,7 @@ THUMB_FUNC void FUN_02054590(enum GFPalLoadLocation location, u32 param1) FUN_02002EEC(location, GF_PAL_SLOT_OFFSET_12, 4); } -THUMB_FUNC void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2) +void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2) { if (param2 == 3) { @@ -27,19 +28,19 @@ THUMB_FUNC void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 } } -THUMB_FUNC void FUN_02054608(struct Window *param0, struct Options *options) +void FUN_02054608(struct Window *param0, struct Options *options) { FUN_0200CD68(param0->bgConfig, GetWindowBgId(param0), 994, 10, (u8)Options_GetFrame(options), 4); FUN_0205464C(param0); DrawFrameAndWindow2(param0, 0, 994, 10); } -THUMB_FUNC void FUN_0205464C(struct Window *param0) +void FUN_0205464C(struct Window *param0) { FillWindowPixelBuffer(param0, 15); } -THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3) +u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3) { TextFlags_SetCanABSpeedUpPrint(param3); FUN_02002B7C(0); @@ -47,7 +48,7 @@ THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct O return AddTextPrinterParameterized(window, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL); } -THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5) +u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5) { TextFlags_SetCanABSpeedUpPrint(a4); FUN_02002B7C(a5); @@ -55,12 +56,12 @@ THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 f return AddTextPrinterParameterized(window, fontId, str, 0, 0, speed, NULL); } -THUMB_FUNC u8 FUN_020546C8(u8 textPrinterNumber) // bool8? +u8 FUN_020546C8(u8 textPrinterNumber) // bool8? { return !FUN_0201BD70(textPrinterNumber); } -THUMB_FUNC void FUN_020546E0( +void FUN_020546E0( struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3) { u32 r4 = 0; @@ -85,7 +86,7 @@ THUMB_FUNC void FUN_020546E0( } } -THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u16 param2) +void FUN_02054744(struct Window *param0, u32 param1, u16 param2) { FUN_0200D300(param0->bgConfig, GetWindowBgId(param0), 0x399, 9, (u8)param1, param2, 4); FillWindowPixelBuffer(param0, 15); diff --git a/arm9/src/timer3.c b/arm9/src/timer3.c index 4e7b03c72..83cd8ca97 100644 --- a/arm9/src/timer3.c +++ b/arm9/src/timer3.c @@ -1,3 +1,4 @@ +#include "global.h" #include "timer3.h" #include "OS_interrupt.h" @@ -10,7 +11,7 @@ static BOOL timer3_needReset; static vu64 timer3_counter; -THUMB_FUNC void Init_Timer3() +void Init_Timer3() { timer3_counter = 0; timer3_needReset = FALSE; @@ -24,7 +25,7 @@ THUMB_FUNC void Init_Timer3() } -THUMB_FUNC void CountUpTimer3() +void CountUpTimer3() { timer3_counter++; @@ -40,7 +41,7 @@ THUMB_FUNC void CountUpTimer3() OS_SetIrqFunction(OS_IE_TIMER3, &CountUpTimer3); } -THUMB_FUNC u64 internal_GetTimer3Count() +u64 internal_GetTimer3Count() { OSIntrMode intr_mode = OS_DisableInterrupts(); @@ -56,17 +57,17 @@ THUMB_FUNC u64 internal_GetTimer3Count() return (counter << 16) | timer3; } -THUMB_FUNC u64 GetTimer3Count() +u64 GetTimer3Count() { return internal_GetTimer3Count(); } -THUMB_FUNC u64 Timer3CountToMilliSeconds(u64 count) +u64 Timer3CountToMilliSeconds(u64 count) { return (count * 64) / (HW_SYSTEM_CLOCK / 1000); } -THUMB_FUNC u64 Timer3CountToSeconds(u64 count) +u64 Timer3CountToSeconds(u64 count) { return (count * 64) / HW_SYSTEM_CLOCK; } diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index 856c93527..b37f61175 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -8,9 +8,6 @@ #include "constants/trainer_classes.h" #include "unk_02024E64.h" -#pragma thumb on - - // Loads all battle opponents, including multi-battle partner if exists. void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 * sav2, u32 heap_id) { diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c index fa1d968f7..42a82943b 100644 --- a/arm9/src/unk_020040F4.c +++ b/arm9/src/unk_020040F4.c @@ -51,20 +51,20 @@ extern void NNS_SndPlayerSetAllocatableChannel(u32, u32); extern BOOL FUN_02005404(void); extern void NNS_SndPlayerSetPlayerVolume(u32, u8); -THUMB_FUNC void FUN_020040F4(u8 param0) +void FUN_020040F4(u8 param0) { u8 *ptr = FUN_02003D38(5); *ptr = param0; } -THUMB_FUNC u8 FUN_02004104(void) +u8 FUN_02004104(void) { u8 *ptr = FUN_02003D38(5); return *ptr; } -THUMB_FUNC void FUN_02004110(u16 param0) +void FUN_02004110(u16 param0) { u16 *ptr = FUN_02003D38(9); *ptr = param0; @@ -72,33 +72,33 @@ THUMB_FUNC void FUN_02004110(u16 param0) FUN_02004130(0); } -THUMB_FUNC u16 FUN_02004124(void) +u16 FUN_02004124(void) { u16 *ptr = FUN_02003D38(9); return *ptr; } -THUMB_FUNC void FUN_02004130(u16 param0) +void FUN_02004130(u16 param0) { u16 *ptr = FUN_02003D38(10); *ptr = param0; } -THUMB_FUNC u16 FUN_02004140(void) +u16 FUN_02004140(void) { u16 *ptr = FUN_02003D38(10); return *ptr; } -THUMB_FUNC void FUN_0200414C(u16 param0) +void FUN_0200414C(u16 param0) { u16 *ptr = FUN_02003D38(31); *ptr = param0; } -THUMB_FUNC void FUN_0200415C(u8 param0) +void FUN_0200415C(u8 param0) { u8 *ptr = FUN_02003D38(20); u8 *ptr2 = FUN_02003D38(21); @@ -114,7 +114,7 @@ THUMB_FUNC void FUN_0200415C(u8 param0) } } -THUMB_FUNC BOOL FUN_02004180(s32 param0) +BOOL FUN_02004180(s32 param0) { BOOL res; switch (param0) @@ -208,7 +208,7 @@ THUMB_FUNC BOOL FUN_02004180(s32 param0) return res; } -THUMB_FUNC BOOL FUN_0200433C(u8 param0, int param1, u32 param2) +BOOL FUN_0200433C(u8 param0, int param1, u32 param2) { u8 *st0 = FUN_02003D38(20); u8 *st4 = FUN_02003D38(21); @@ -294,7 +294,7 @@ THUMB_FUNC BOOL FUN_0200433C(u8 param0, int param1, u32 param2) return TRUE; } -THUMB_FUNC void FUN_020044A8(s32 param0) +void FUN_020044A8(s32 param0) { int *ptr = FUN_02003D38(23); GF_Snd_RestoreState(*ptr); @@ -308,7 +308,7 @@ THUMB_FUNC void FUN_020044A8(s32 param0) GF_Snd_SaveState(ptr3); } -THUMB_FUNC void FUN_020044D4(int seqNo, u32 param1) +void FUN_020044D4(int seqNo, u32 param1) { #pragma unused(param1) @@ -349,7 +349,7 @@ THUMB_FUNC void FUN_020044D4(int seqNo, u32 param1) FUN_0200521C(seqNo); } -THUMB_FUNC void FUN_02004568(int seqNo, u16 param1) +void FUN_02004568(int seqNo, u16 param1) { #pragma unused(param1) @@ -372,7 +372,7 @@ THUMB_FUNC void FUN_02004568(int seqNo, u16 param1) FUN_02004DBC(0); } -THUMB_FUNC void FUN_020045C4(int seqNo, u32 param1) +void FUN_020045C4(int seqNo, u32 param1) { u8 *ptr = FUN_02003D38(18); u16 *ptr2 = FUN_02003D38(31); @@ -403,7 +403,7 @@ THUMB_FUNC void FUN_020045C4(int seqNo, u32 param1) GF_Snd_SaveState((int *)FUN_02003D38(26)); } -THUMB_FUNC void FUN_02004648(int param0, u32 param1) +void FUN_02004648(int param0, u32 param1) { #pragma unused(param1) FUN_02003D38(23); @@ -416,7 +416,7 @@ THUMB_FUNC void FUN_02004648(int param0, u32 param1) FUN_0200521C(param0); } -THUMB_FUNC void FUN_02004680(int param0, u32 param1) +void FUN_02004680(int param0, u32 param1) { #pragma unused(param1) FUN_02003D38(23); @@ -426,7 +426,7 @@ THUMB_FUNC void FUN_02004680(int param0, u32 param1) FUN_0200521C(param0); } -THUMB_FUNC void FUN_020046A0(int param0, u32 param1) +void FUN_020046A0(int param0, u32 param1) { #pragma unused(param1) FUN_02003D38(23); @@ -436,7 +436,7 @@ THUMB_FUNC void FUN_020046A0(int param0, u32 param1) FUN_0200521C(param0); } -THUMB_FUNC void FUN_020046C4(int param0, u32 param1) +void FUN_020046C4(int param0, u32 param1) { #pragma unused(param1) FUN_02003D38(23); @@ -446,14 +446,14 @@ THUMB_FUNC void FUN_020046C4(int param0, u32 param1) FUN_0200521C(param0); } -THUMB_FUNC void FUN_020046E8(s32 param0) +void FUN_020046E8(s32 param0) { FUN_02004738(); FUN_02004180(param0); GF_Snd_SaveState((int *)FUN_02003D38(27)); } -THUMB_FUNC void FUN_02004704(s32 param0, int param1, u32 param2) +void FUN_02004704(s32 param0, int param1, u32 param2) { #pragma unused(param2) FUN_02003D38(23); @@ -462,19 +462,19 @@ THUMB_FUNC void FUN_02004704(s32 param0, int param1, u32 param2) FUN_0200521C(param1); } -THUMB_FUNC void FUN_02004724(int param0) +void FUN_02004724(int param0) { GetSoundDataPointer(); FUN_020051AC(); FUN_0200521C(param0); } -THUMB_FUNC void FUN_02004738(void) +void FUN_02004738(void) { GF_Snd_RestoreState(FUN_02004748(4)); } -THUMB_FUNC int FUN_02004748(s32 param0) +int FUN_02004748(s32 param0) { GetSoundDataPointer(); @@ -513,7 +513,7 @@ THUMB_FUNC int FUN_02004748(s32 param0) return *r5; } -THUMB_FUNC void FUN_020047C8(u8 param0, u8 param1) +void FUN_020047C8(u8 param0, u8 param1) { u8 *ptr; int r4; @@ -542,7 +542,7 @@ THUMB_FUNC void FUN_020047C8(u8 param0, u8 param1) *ptr = param1; } -THUMB_FUNC void FUN_02004810(void) +void FUN_02004810(void) { u8 *ptr = FUN_02003D38(11); u8 *ptr2 = FUN_02003D38(12); @@ -550,12 +550,12 @@ THUMB_FUNC void FUN_02004810(void) *ptr2 = 0; } -THUMB_FUNC void GF_SndPlayerMoveVolume(int playerNo, s32 param1, s32 param2) +void GF_SndPlayerMoveVolume(int playerNo, s32 param1, s32 param2) { NNS_SndPlayerMoveVolume(GetSoundPlayer(playerNo), param1, param2); } -THUMB_FUNC void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1) +void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1) { if (param1 < 0) { @@ -570,7 +570,7 @@ THUMB_FUNC void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1) NNS_SndPlayerSetInitialVolume(GetSoundPlayer(playerNo), param1); } -THUMB_FUNC void FUN_02004858(u32 param0, int playerNo) +void FUN_02004858(u32 param0, int playerNo) { u8 *ret = NNS_SndArcGetSeqParam(param0); u8 r4; @@ -594,24 +594,24 @@ THUMB_FUNC void FUN_02004858(u32 param0, int playerNo) } } -THUMB_FUNC void FUN_0200488C(u16 param0, u16 param1) +void FUN_0200488C(u16 param0, u16 param1) { GF_SndPlayerSetInitialVolume(FUN_02004018(FUN_020048D0(param0)), param1); } -THUMB_FUNC void GF_SndArcPlayerStartSeqEx(int playerNo, u32 param1, u32 param2) +void GF_SndArcPlayerStartSeqEx(int playerNo, u32 param1, u32 param2) { NNS_SndArcPlayerStartSeqEx(GetSoundPlayer(playerNo), param1, -1, -1, param2); } -THUMB_FUNC u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int playerNo) +u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int playerNo) { GF_ASSERT(playerNo >= 0); return NNS_SndPlayerCountPlayingSeqByPlayerNo(playerNo); } -THUMB_FUNC u8 FUN_020048D0(u16 param0) +u8 FUN_020048D0(u16 param0) { if (param0 == 0) { @@ -627,17 +627,17 @@ THUMB_FUNC u8 FUN_020048D0(u16 param0) return ptr[5]; } -THUMB_FUNC u32 GF_SndPlayerGetSeqNo(u32 *param0) +u32 GF_SndPlayerGetSeqNo(u32 *param0) { return NNS_SndPlayerGetSeqNo(param0); } -THUMB_FUNC u32 FUN_020048F4(u16 param0) +u32 FUN_020048F4(u16 param0) { return NNS_SndArcGetBankInfo(FUN_02004900(param0)); } -THUMB_FUNC u16 FUN_02004900(u32 param0) +u16 FUN_02004900(u32 param0) { u16 *ptr = NNS_SndArcGetSeqParam(param0); if (ptr == NULL) @@ -648,23 +648,23 @@ THUMB_FUNC u16 FUN_02004900(u32 param0) return *ptr; } -THUMB_FUNC u32 GF_MIC_StartAutoSampling(struct MIC_SamplingData *param0) +u32 GF_MIC_StartAutoSampling(struct MIC_SamplingData *param0) { return MIC_StartAutoSampling(param0); } -THUMB_FUNC u32 GF_MIC_StopAutoSampling(void) +u32 GF_MIC_StopAutoSampling(void) { GetSoundDataPointer(); return MIC_StopAutoSampling(); } -THUMB_FUNC u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3) +u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3) { return MIC_DoSamplingAsync(param0, param1, param2, param3); } -THUMB_FUNC void *FUN_02004930(u32 param0) +void *FUN_02004930(u32 param0) { GetSoundDataPointer(); u8 *ptr = FUN_02003D38(15); @@ -681,7 +681,7 @@ THUMB_FUNC void *FUN_02004930(u32 param0) return FUN_02003D38(1); } -THUMB_FUNC BOOL FUN_02004984(u32 param0) +BOOL FUN_02004984(u32 param0) { GetSoundDataPointer(); u8 *ptr = FUN_02003D38(15); @@ -727,7 +727,7 @@ THUMB_FUNC BOOL FUN_02004984(u32 param0) return TRUE; } -THUMB_FUNC void FUN_02004A04(u32 param0) +void FUN_02004A04(u32 param0) { GetSoundDataPointer(); u8 *ptr = FUN_02003D38(15); @@ -765,7 +765,7 @@ THUMB_FUNC void FUN_02004A04(u32 param0) } } -THUMB_FUNC u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1) +u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1) { u32 res = NNS_SndWaveOutStart(*(u32 *)param0->unk00, param0->unk04, @@ -785,17 +785,17 @@ THUMB_FUNC u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1) return res; } -THUMB_FUNC void FUN_02004AAC(u32 param0) +void FUN_02004AAC(u32 param0) { NNS_SndWaveOutStop(*(u32 *)FUN_02004930(param0)); } -THUMB_FUNC BOOL FUN_02004ABC(u32 param0) +BOOL FUN_02004ABC(u32 param0) { return NNS_SndWaveOutIsPlaying(*(u32 *)FUN_02004930(param0)); } -THUMB_FUNC void FUN_02004ACC(u32 param0, u32 param1) +void FUN_02004ACC(u32 param0, u32 param1) { if (param1 > 127) { @@ -805,12 +805,12 @@ THUMB_FUNC void FUN_02004ACC(u32 param0, u32 param1) NNS_SndWaveOutSetPan(*(u32 *)FUN_02004930(param0), param1); } -THUMB_FUNC void FUN_02004AE4(u32 param0, u32 param1) +void FUN_02004AE4(u32 param0, u32 param1) { NNS_SndWaveOutSetSpeed(*(u32 *)FUN_02004930(param0), param1); } -THUMB_FUNC void FUN_02004AF8(u32 param0, s32 param1) +void FUN_02004AF8(u32 param0, s32 param1) { if (FUN_020313EC() == 1) { @@ -821,7 +821,7 @@ THUMB_FUNC void FUN_02004AF8(u32 param0, s32 param1) NNS_SndWaveOutSetVolume(*(u32 *)FUN_02004930(param0), param1); } -THUMB_FUNC u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 param4) +u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 param4) { GetSoundDataPointer(); @@ -884,7 +884,7 @@ THUMB_FUNC u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 return ret; } -THUMB_FUNC void FUN_02004C1C(u8 *param0, u32 param1) +void FUN_02004C1C(u8 *param0, u32 param1) { for (u32 r5 = 0; r5 < param1 / 2; r5++) { @@ -894,7 +894,7 @@ THUMB_FUNC void FUN_02004C1C(u8 *param0, u32 param1) } } -THUMB_FUNC void FUN_02004C3C(u32 param0) +void FUN_02004C3C(u32 param0) { GetSoundDataPointer(); u8 *ptr = FUN_02003D38(14); @@ -911,29 +911,29 @@ THUMB_FUNC void FUN_02004C3C(u32 param0) } } -THUMB_FUNC BOOL GF_SndCaptureIsActive(void) +BOOL GF_SndCaptureIsActive(void) { return NNS_SndCaptureIsActive(); } -THUMB_FUNC u32 GF_SndCaptureStartReverb(u32 param0) +u32 GF_SndCaptureStartReverb(u32 param0) { GetSoundDataPointer(); return NNS_SndCaptureStartReverb(FUN_02003D38(3), 0x1000, 0, 0x3E80, param0); } -THUMB_FUNC void GF_SndCaptureStopReverb(u32 param0) +void GF_SndCaptureStopReverb(u32 param0) { NNS_SndCaptureStopReverb(param0); } -THUMB_FUNC void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1) +void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1) { NNS_SndCaptureSetReverbVolume(param0, param1); } -THUMB_FUNC void FUN_02004CB4(void) +void FUN_02004CB4(void) { GetSoundDataPointer(); @@ -945,12 +945,12 @@ THUMB_FUNC void FUN_02004CB4(void) NNS_SndCaptureStartEffect(r4, 0x1000, 0, 0x55F0, 2, FUN_02005068, st8); } -THUMB_FUNC void GF_SndCaptureStopEffect(void) +void GF_SndCaptureStopEffect(void) { NNS_SndCaptureStopEffect(); } -THUMB_FUNC void FUN_02004D04(s32 param0) +void FUN_02004D04(s32 param0) { u8 *ptr = FUN_02003D38(19); @@ -966,38 +966,38 @@ THUMB_FUNC void FUN_02004D04(s32 param0) *ptr = (u8)param0; } -THUMB_FUNC void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, s32 param2) +void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, s32 param2) { NNS_SndPlayerSetTrackPitch(GetSoundPlayer(playerNo), param1, param2); } -THUMB_FUNC void FUN_02004D34(u16 param0, u32 param1, s32 param2) +void FUN_02004D34(u16 param0, u32 param1, s32 param2) { GF_SndPlayerSetTrackPitch(FUN_02004018(FUN_020048D0(param0)), param1, param2); } -THUMB_FUNC void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, s32 param2) +void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, s32 param2) { NNS_SndPlayerSetTrackPan(GetSoundPlayer(playerNo), param1, param2); } -THUMB_FUNC void GF_SndSetMonoFlag(u32 param0) +void GF_SndSetMonoFlag(u32 param0) { NNS_SndSetMonoFlag(param0); UNK_021C3DD8[0] = param0; } -THUMB_FUNC void FUN_02004D74(s32 param0) +void FUN_02004D74(s32 param0) { *(s32 *)FUN_02003D38(6) = param0; } -THUMB_FUNC void FUN_02004D84(u32 param0) +void FUN_02004D84(u32 param0) { *(u32 *)FUN_02003D38(7) = param0; } -THUMB_FUNC u16 FUN_02004D94(void) +u16 FUN_02004D94(void) { u16 *ptr = FUN_02003D38(7); @@ -1010,17 +1010,17 @@ THUMB_FUNC u16 FUN_02004D94(void) return --(*ptr); } -THUMB_FUNC u8 *FUN_02004DB4(void) +u8 *FUN_02004DB4(void) { return UNK_021C3DE0; } -THUMB_FUNC void FUN_02004DBC(u8 param0) +void FUN_02004DBC(u8 param0) { *(u8 *)FUN_02003D38(18) = param0; } -THUMB_FUNC u32 FUN_02004DCC(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5) +u32 FUN_02004DCC(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5) { u8 *ptr = FUN_02003D38(21); @@ -1031,7 +1031,7 @@ THUMB_FUNC u32 FUN_02004DCC(u32 param0, u16 param1, u32 param2, u32 param3, u8 p return 1; } -THUMB_FUNC u32 FUN_02004E08( +u32 FUN_02004E08( u32 param0, u16 param1, u32 param2, u32 param3, u32 param35, u8 param4, u32 param5) { u32 *ptr = FUN_02003D38(8); @@ -1043,7 +1043,7 @@ THUMB_FUNC u32 FUN_02004E08( return 1; } -THUMB_FUNC void FUN_02004E44(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5) +void FUN_02004E44(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5) { #pragma unused(param0) #pragma unused(param5) @@ -1058,7 +1058,7 @@ THUMB_FUNC void FUN_02004E44(u32 param0, u16 param1, u32 param2, u32 param3, u8 FUN_02004DBC(param4); } -THUMB_FUNC u32 FUN_02004E80(u32 param0) +u32 FUN_02004E80(u32 param0) { if (param0 == 0) { @@ -1068,7 +1068,7 @@ THUMB_FUNC u32 FUN_02004E80(u32 param0) return param0 + 12; } -THUMB_FUNC u32 FUN_02004E8C(u32 *param0) +u32 FUN_02004E8C(u32 *param0) { if (param0 == NULL) { @@ -1078,7 +1078,7 @@ THUMB_FUNC u32 FUN_02004E8C(u32 *param0) return param0[2]; } -THUMB_FUNC u32 FUN_02004E98(s32 param0) +u32 FUN_02004E98(s32 param0) { GF_Snd_RestoreState(FUN_02004748(5)); @@ -1093,7 +1093,7 @@ THUMB_FUNC u32 FUN_02004E98(s32 param0) return FUN_02004ED0(r4); } -THUMB_FUNC u32 FUN_02004ED0(s32 param0) +u32 FUN_02004ED0(s32 param0) { u32 *ptr = FUN_02003D38(32); @@ -1122,7 +1122,7 @@ THUMB_FUNC u32 FUN_02004ED0(s32 param0) return *ptr; } -THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2) +u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2) { #pragma unused(param0) u32 r4 = GF_SndPlayerGetTick(1); @@ -1152,12 +1152,12 @@ THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 return r0; } -THUMB_FUNC u32 GF_SndPlayerGetTick(int playerNo) +u32 GF_SndPlayerGetTick(int playerNo) { return NNS_SndPlayerGetTick(GetSoundPlayer(playerNo)); } -THUMB_FUNC void FUN_02004F70( +void FUN_02004F70( struct UnkStruct_020040F4_2 *param0, u8 *param1, int param2, s32 param3) { int r0; @@ -1262,7 +1262,7 @@ THUMB_FUNC void FUN_02004F70( } } -THUMB_FUNC void FUN_02005068(s16 *param0, s16 *param1, u32 param2, u32 param3, void *param4) +void FUN_02005068(s16 *param0, s16 *param1, u32 param2, u32 param3, void *param4) { s16 st10[8][2]; s16(*st0)[2] = param4; @@ -1316,12 +1316,12 @@ THUMB_FUNC void FUN_02005068(s16 *param0, s16 *param1, u32 param2, u32 param3, v DC_FlushRange(param1, param2); } -THUMB_FUNC void FUN_02005160(u32 param0) +void FUN_02005160(u32 param0) { NNS_SndPlayerSetAllocatableChannel(7, param0); } -THUMB_FUNC void FUN_0200516C(u32 param0) +void FUN_0200516C(u32 param0) { if (param0 == 0) { @@ -1342,7 +1342,7 @@ THUMB_FUNC void FUN_0200516C(u32 param0) GF_SndCaptureIsActive(); } -THUMB_FUNC void FUN_020051AC(void) +void FUN_020051AC(void) { if (FUN_02005404() == FALSE && GF_SndPlayerGetSeqNo(GetSoundPlayer(0)) != -1 && FUN_02004124() != 0x47e) @@ -1356,7 +1356,7 @@ THUMB_FUNC void FUN_020051AC(void) FUN_0200541C(); } -THUMB_FUNC void GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1) +void GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1) { NNS_SndPlayerSetPlayerVolume(param0, param1); } diff --git a/arm9/src/unk_020051F4.c b/arm9/src/unk_020051F4.c index 533110397..c1e72f6aa 100644 --- a/arm9/src/unk_020051F4.c +++ b/arm9/src/unk_020051F4.c @@ -16,7 +16,7 @@ extern void NNS_SndPlayerStopSeq(u32 *, u32); extern void NNS_SndPlayerSetTrackPan(u32 *, u32, u32); extern void *FUN_0201B6C8(u32 *); -THUMB_FUNC u32 FUN_020051F4(u16 param0) +u32 FUN_020051F4(u16 param0) { int playerNo = FUN_02004018(FUN_020048D0(param0)); @@ -27,7 +27,7 @@ THUMB_FUNC u32 FUN_020051F4(u16 param0) return ret; } -THUMB_FUNC u32 FUN_0200521C(u16 param0) +u32 FUN_0200521C(u16 param0) { u8 r4 = FUN_020048D0(param0); int playerNo = FUN_02004018(r4); @@ -53,7 +53,7 @@ THUMB_FUNC u32 FUN_0200521C(u16 param0) return ret; } -THUMB_FUNC void FUN_0200526C(u16 param0, int playerNo) +void FUN_0200526C(u16 param0, int playerNo) { FUN_02004110(param0); FUN_02004858(param0, playerNo); @@ -61,7 +61,7 @@ THUMB_FUNC void FUN_0200526C(u16 param0, int playerNo) FUN_02003CE8(1); } -THUMB_FUNC u32 FUN_02005288(u16 param0, u32 param1, int playerNo) +u32 FUN_02005288(u16 param0, u32 param1, int playerNo) { #pragma unused(param1) GF_Snd_RestoreState(FUN_02004748(3)); @@ -70,7 +70,7 @@ THUMB_FUNC u32 FUN_02005288(u16 param0, u32 param1, int playerNo) return NNS_SndArcPlayerStartSeq(GetSoundPlayer(playerNo), param0); } -THUMB_FUNC u32 FUN_020052B8(u16 param0, u32 param1, int playerNo) +u32 FUN_020052B8(u16 param0, u32 param1, int playerNo) { #pragma unused(param1) FUN_02003D38(18); @@ -81,7 +81,7 @@ THUMB_FUNC u32 FUN_020052B8(u16 param0, u32 param1, int playerNo) return NNS_SndArcPlayerStartSeqEx(GetSoundPlayer(playerNo), -1, FUN_02004900(*r4), -1, param0); } -THUMB_FUNC u32 FUN_02005308(u32 param0, u16 param1) +u32 FUN_02005308(u32 param0, u16 param1) { if (param0 != 4) { @@ -104,7 +104,7 @@ THUMB_FUNC u32 FUN_02005308(u32 param0, u16 param1) return r4; } -THUMB_FUNC void FUN_02005350(u16 param0, u32 param1) +void FUN_02005350(u16 param0, u32 param1) { NNS_SndPlayerStopSeqBySeqNo(param0, param1); @@ -117,14 +117,14 @@ THUMB_FUNC void FUN_02005350(u16 param0, u32 param1) FUN_02005374(); } -THUMB_FUNC void FUN_02005374() +void FUN_02005374() { FUN_02004110(0); FUN_02004130(0); FUN_02003CE8(0); } -THUMB_FUNC void FUN_0200538C(s32 param0, u16 param1, u32 param2) +void FUN_0200538C(s32 param0, u16 param1, u32 param2) { u8 r0 = FUN_020048D0(FUN_02004124()); if (r0 == 0xff) @@ -143,7 +143,7 @@ THUMB_FUNC void FUN_0200538C(s32 param0, u16 param1, u32 param2) FUN_02003CE8(3); } -THUMB_FUNC void FUN_020053CC(s32 param0, s32 param1) +void FUN_020053CC(s32 param0, s32 param1) { u8 r6 = FUN_020048D0(FUN_02004124()); if (r6 == 0xff) @@ -160,17 +160,17 @@ THUMB_FUNC void FUN_020053CC(s32 param0, s32 param1) FUN_02003CE8(4); } -THUMB_FUNC u16 FUN_02005404() +u16 FUN_02005404() { return *(u16 *)FUN_02003D38(6); } -THUMB_FUNC u16 FUN_02005410(u16 param0) +u16 FUN_02005410(u16 param0) { return GF_SndPlayerCountPlayingSeqByPlayerNo(FUN_020048D0(param0)); } -THUMB_FUNC void FUN_0200541C() +void FUN_0200541C() { u8 *r5 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(16); @@ -189,7 +189,7 @@ THUMB_FUNC void FUN_0200541C() FUN_02003CE8(0); } -THUMB_FUNC void FUN_02005454() +void FUN_02005454() { u8 *r5 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(16); @@ -215,7 +215,7 @@ THUMB_FUNC void FUN_02005454() } } -THUMB_FUNC u32 FUN_020054A8(u16 param0, u32 param1) +u32 FUN_020054A8(u16 param0, u32 param1) { u32 r6 = PlaySE(param0); FUN_02005530(param0, 0xFFFF, param1); @@ -223,7 +223,7 @@ THUMB_FUNC u32 FUN_020054A8(u16 param0, u32 param1) return r6; } -THUMB_FUNC u32 PlaySE(u16 param0) +u32 PlaySE(u16 param0) { int playerNo = FUN_02004018(FUN_020048D0(param0)); @@ -233,22 +233,22 @@ THUMB_FUNC u32 PlaySE(u16 param0) return r6; } -THUMB_FUNC void FUN_020054F0(u32 param0, u32 param1) +void FUN_020054F0(u32 param0, u32 param1) { NNS_SndPlayerStopSeqBySeqNo(param0, param1); } -THUMB_FUNC void FUN_020054F8(s32 param0, u32 param1) +void FUN_020054F8(s32 param0, u32 param1) { NNS_SndPlayerStopSeq(GetSoundPlayer(param0), param1); } -THUMB_FUNC u16 FUN_02005508(u16 param0) +u16 FUN_02005508(u16 param0) { return GF_SndPlayerCountPlayingSeqByPlayerNo(FUN_020048D0(param0)); } -THUMB_FUNC BOOL FUN_02005514() +BOOL FUN_02005514() { for (s32 i = 0; i < 4; i++) { @@ -261,12 +261,12 @@ THUMB_FUNC BOOL FUN_02005514() return FALSE; } -THUMB_FUNC void FUN_02005530(u16 param0, u32 param1, u32 param2) +void FUN_02005530(u16 param0, u32 param1, u32 param2) { NNS_SndPlayerSetTrackPan(GetSoundPlayer(FUN_02004018(FUN_020048D0(param0))), param1, param2); } -THUMB_FUNC void FUN_0200554C(u32 param0) +void FUN_0200554C(u32 param0) { int playerNo = FUN_02004018(3); @@ -276,7 +276,7 @@ THUMB_FUNC void FUN_0200554C(u32 param0) } } -THUMB_FUNC u32 FUN_02005578(u16 species) +u32 FUN_02005578(u16 species) { u8 *r4 = FUN_02003D38(17); struct SaveChatotSoundClip **r0 = FUN_02003D38(35); @@ -317,7 +317,7 @@ THUMB_FUNC u32 FUN_02005578(u16 species) return res; } -THUMB_FUNC void FUN_02005614(u32 param0) +void FUN_02005614(u32 param0) { u8 *r6 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(16); @@ -341,7 +341,7 @@ THUMB_FUNC void FUN_02005614(u32 param0) FUN_02005DFC(); } -THUMB_FUNC BOOL FUN_02005670() +BOOL FUN_02005670() { u8 *r5 = FUN_02003D38(15); u8 *r4 = FUN_02003D38(16); @@ -360,7 +360,7 @@ THUMB_FUNC BOOL FUN_02005670() return GF_SndPlayerCountPlayingSeqByPlayerNo(0); } -THUMB_FUNC u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32 param4) +u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32 param4) { s32 st1c, st18; u8 *st14 = FUN_02003D38(15); @@ -540,13 +540,13 @@ THUMB_FUNC u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32 return 1; } -THUMB_FUNC void FUN_02005AC8(u32 param0, int playerNo, s32 param2) +void FUN_02005AC8(u32 param0, int playerNo, s32 param2) { GF_SndPlayerSetInitialVolume(playerNo, param2); FUN_02004858(param0, playerNo); } -THUMB_FUNC void FUN_02005AE0(u32 param0, u32 param1) +void FUN_02005AE0(u32 param0, u32 param1) { u32 *r6 = FUN_02003D38(34); FUN_02005BA0(); @@ -573,7 +573,7 @@ THUMB_FUNC void FUN_02005AE0(u32 param0, u32 param1) *r6 = r0; } -THUMB_FUNC void FUN_02005B2C(u32 param0, s32 *param1) +void FUN_02005B2C(u32 param0, s32 *param1) { #pragma unused(param0) u8 *r6 = FUN_02003D38(15); @@ -610,7 +610,7 @@ THUMB_FUNC void FUN_02005B2C(u32 param0, s32 *param1) } } -THUMB_FUNC void FUN_02005BA0() +void FUN_02005BA0() { u32 **r4 = FUN_02003D38(34); if (*r4 != NULL) @@ -623,7 +623,7 @@ THUMB_FUNC void FUN_02005BA0() *r4 = 0; } -THUMB_FUNC u32 FUN_02005BC8(u16 param0, s32 param1) +u32 FUN_02005BC8(u16 param0, s32 param1) { *(u8 *)FUN_02003D38(17) = 1; @@ -635,7 +635,7 @@ THUMB_FUNC u32 FUN_02005BC8(u16 param0, s32 param1) return res; } -THUMB_FUNC void FUN_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, u32 param4) +void FUN_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, u32 param4) { #pragma unused(param1) *(u8 *)FUN_02003D38(17) = 1; @@ -644,7 +644,7 @@ THUMB_FUNC void FUN_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, u32 FUN_02004B30(param0, param2, param3, 15, param4); } -THUMB_FUNC u32 PlaySound(u16 param0) +u32 PlaySound(u16 param0) { FUN_020048F4(param0); FUN_02005CEC(param0); @@ -663,7 +663,7 @@ THUMB_FUNC u32 PlaySound(u16 param0) return res; } -THUMB_FUNC BOOL FUN_02005C74() +BOOL FUN_02005C74() { u16 *r4 = FUN_02003D38(13); @@ -681,13 +681,13 @@ THUMB_FUNC BOOL FUN_02005C74() return FALSE; } -THUMB_FUNC void FUN_02005CA0(u32 param0) +void FUN_02005CA0(u32 param0) { NNS_SndPlayerStopSeq(GetSoundPlayer(2), param0); GF_Snd_RestoreState(FUN_02004748(6)); } -THUMB_FUNC BOOL FUN_02005CBC() +BOOL FUN_02005CBC() { FUN_02003D38(13); @@ -707,7 +707,7 @@ THUMB_FUNC BOOL FUN_02005CBC() return FALSE; } -THUMB_FUNC void FUN_02005CEC(u16 param0) +void FUN_02005CEC(u16 param0) { #pragma unused(param0) *(u16 *)FUN_02003D38(13) = 15; diff --git a/arm9/src/unk_020061E8.c b/arm9/src/unk_020061E8.c index a06bcabf7..4e55e9687 100644 --- a/arm9/src/unk_020061E8.c +++ b/arm9/src/unk_020061E8.c @@ -5,7 +5,7 @@ extern struct TextPrinter *FUN_0201B6C8(void); -THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, void *), u32 r1, u32 r2, u32 r3) +BOOL FUN_020061E8(void (*r0)(u32, void *), u32 r1, u32 r2, u32 r3) { void * r4; if(r1 != 0) @@ -24,7 +24,7 @@ THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, void *), u32 r1, u32 r2, u32 r3) return FUN_0200CA44(r0, r4, r2); } -THUMB_FUNC void FUN_0200621C(s32 r4) +void FUN_0200621C(s32 r4) { struct TextPrinter * r0 = FUN_0201B6C8(); if(r0 != NULL) diff --git a/arm9/src/unk_02006D98.c b/arm9/src/unk_02006D98.c index ee7a8341c..77ac6c4c2 100644 --- a/arm9/src/unk_02006D98.c +++ b/arm9/src/unk_02006D98.c @@ -295,7 +295,7 @@ extern void NNS_G2dDrawSpriteFast(s16 param0, int param7, int param8); -THUMB_FUNC struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id) +struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id) { struct UnkStruct_02006D98 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02006D98)); ptr->unk298 = heap_id; @@ -350,7 +350,7 @@ THUMB_FUNC struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id) return ptr; } -THUMB_FUNC void FUN_02006ED4(struct UnkStruct_02006D98 *param0) +void FUN_02006ED4(struct UnkStruct_02006D98 *param0) { s32 arg3; s32 arg4; @@ -518,7 +518,7 @@ THUMB_FUNC void FUN_02006ED4(struct UnkStruct_02006D98 *param0) G3_PopMtx(1); } -THUMB_FUNC void FUN_020072E8(struct UnkStruct_02006D98 *param0) +void FUN_020072E8(struct UnkStruct_02006D98 *param0) { FreeToHeap(param0->unk2AC); FreeToHeap(param0->unk2B0); @@ -526,7 +526,7 @@ THUMB_FUNC void FUN_020072E8(struct UnkStruct_02006D98 *param0) FreeToHeap(param0); } -THUMB_FUNC void FUN_02007314(struct UnkStruct_02006D98_2 *param0) +void FUN_02007314(struct UnkStruct_02006D98_2 *param0) { param0->unk59 = 0; for (s32 i = 0; i < 10; i++) @@ -544,13 +544,13 @@ THUMB_FUNC void FUN_02007314(struct UnkStruct_02006D98_2 *param0) param0->unk5A = param0->unk84[param0->unk59].unk1; } -THUMB_FUNC void FUN_0200737C( +void FUN_0200737C( struct UnkStruct_02006D98_2 *param0, struct UnkStruct_02006D98_sub *param1) { MI_CpuCopy8(param1, param0->unk84, sizeof(struct UnkStruct_02006D98_sub) * 10); } -THUMB_FUNC BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0) +BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0) { if (param0->unk58 != 0) { @@ -559,7 +559,7 @@ THUMB_FUNC BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0) return FALSE; } -THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0, +struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0, struct UnkStruct_02006D98_4 *param1, u32 param2, u32 param3, @@ -581,7 +581,7 @@ THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 * return FUN_020073E8(param0, param1, param2, param3, param4, param5, i, param6, param7); } -THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0, +struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0, struct UnkStruct_02006D98_4 *param1, u32 param2, u32 param3, @@ -628,12 +628,12 @@ THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 * return ¶m0->unk000[param6]; } -THUMB_FUNC void FUN_02007534(struct UnkStruct_02006D98_2 *param0) +void FUN_02007534(struct UnkStruct_02006D98_2 *param0) { param0->unk00_0 = 0; } -THUMB_FUNC void FUN_02007540(struct UnkStruct_02006D98 *param0) +void FUN_02007540(struct UnkStruct_02006D98 *param0) { for (s32 i = 0; i < 4; i++) { @@ -641,7 +641,7 @@ THUMB_FUNC void FUN_02007540(struct UnkStruct_02006D98 *param0) } } -THUMB_FUNC void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2) +void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2) { switch (param1) { @@ -794,7 +794,7 @@ THUMB_FUNC void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u3 } } -THUMB_FUNC u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1) +u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1) { switch (param1) { @@ -942,7 +942,7 @@ THUMB_FUNC u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1) return 0; } -THUMB_FUNC void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2) +void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2) { switch (param1) { @@ -1095,7 +1095,7 @@ THUMB_FUNC void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u3 } } -THUMB_FUNC void FUN_02007E40( +void FUN_02007E40( struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { param0->unk54_1 = 1; @@ -1105,7 +1105,7 @@ THUMB_FUNC void FUN_02007E40( param0->unk47 = (u8)param4; } -THUMB_FUNC void FUN_02007E68( +void FUN_02007E68( struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { param0->unk54_C = 1; @@ -1116,7 +1116,7 @@ THUMB_FUNC void FUN_02007E68( param0->unk4C = param4; } -THUMB_FUNC void FUN_02007E98( +void FUN_02007E98( struct UnkStruct_02006D98 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { for (s32 i = 0; i < 4; i++) @@ -1135,7 +1135,7 @@ THUMB_FUNC void FUN_02007E98( } } -THUMB_FUNC void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0) +void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0) { param0->unk54_C = 0; param0->unk48 = 0; @@ -1146,12 +1146,12 @@ THUMB_FUNC void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0) param0->unk00_8 = 1; } -THUMB_FUNC BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0) +BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0) { return param0->unk54_C == 1; } -THUMB_FUNC void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1) +void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1) { param0->unk2E = (s16)((40 - param1) - (((40 - param1) * param0->unk36) >> 8)); } @@ -1204,7 +1204,7 @@ static inline void inlineLoop(u8 *unk58, } } -THUMB_FUNC void FUN_02007F48(struct UnkStruct_02006D98_2 *param0) +void FUN_02007F48(struct UnkStruct_02006D98_2 *param0) { inlineLoop(¶m0->unk58, ¶m0->unk59, @@ -1214,7 +1214,7 @@ THUMB_FUNC void FUN_02007F48(struct UnkStruct_02006D98_2 *param0) param0->unk84); } -THUMB_FUNC void FUN_02008010( +void FUN_02008010( struct UnkStruct_02006D98_5 *param0, struct UnkStruct_02006D98_sub *param1) { param0->unk00 = 1; @@ -1229,7 +1229,7 @@ THUMB_FUNC void FUN_02008010( } } -THUMB_FUNC s32 FUN_02008030(struct UnkStruct_02006D98_5 *param0) +s32 FUN_02008030(struct UnkStruct_02006D98_5 *param0) { if (param0->unk00 != 0) { @@ -1245,19 +1245,19 @@ THUMB_FUNC s32 FUN_02008030(struct UnkStruct_02006D98_5 *param0) return -1; } -THUMB_FUNC void FUN_020080D0(struct UnkStruct_02006D98_2 *param0) +void FUN_020080D0(struct UnkStruct_02006D98_2 *param0) { param0->unk00_7 = 1; param0->unk00_8 = 1; } -THUMB_FUNC void FUN_020080E0(struct UnkStruct_02006D98_2 *param0) +void FUN_020080E0(struct UnkStruct_02006D98_2 *param0) { param0->unk14 = param0->unk04; param0->unk78 = param0->unk6C; } -THUMB_FUNC void FUN_0200813C(struct UnkStruct_02006D98_2 *param0) +void FUN_0200813C(struct UnkStruct_02006D98_2 *param0) { param0->unk04 = param0->unk14; param0->unk6C = param0->unk78; @@ -1265,24 +1265,24 @@ THUMB_FUNC void FUN_0200813C(struct UnkStruct_02006D98_2 *param0) param0->unk00_8 = 1; } -THUMB_FUNC void FUN_020081A8(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2) +void FUN_020081A8(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2) { param0->unk29C = param1; param0->unk2A0 = param2; } -THUMB_FUNC void FUN_020081B4(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2) +void FUN_020081B4(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2) { param0->unk2A4 = param1; param0->unk2A8 = param2; } -THUMB_FUNC u32 FUN_020081C0(u32 param0) +u32 FUN_020081C0(u32 param0) { return param0 + 4; } -THUMB_FUNC void FUN_020081C4(struct UnkStruct_02006D98 *param0) +void FUN_020081C4(struct UnkStruct_02006D98 *param0) { if (param0->unk2E1 != 0) { @@ -1311,28 +1311,28 @@ THUMB_FUNC void FUN_020081C4(struct UnkStruct_02006D98 *param0) } } -THUMB_FUNC void FUN_0200825C(struct UnkStruct_02006D98 *param0, u8 param1) +void FUN_0200825C(struct UnkStruct_02006D98 *param0, u8 param1) { param0->unk2E3 = param1; } -THUMB_FUNC BOOL FUN_02008268(struct UnkStruct_02006D98_2 *param0) +BOOL FUN_02008268(struct UnkStruct_02006D98_2 *param0) { GF_ASSERT(param0); return param0->unk00_0 != 0; } -THUMB_FUNC void FUN_02008284(struct UnkStruct_02006D98 *param0, u32 param1) +void FUN_02008284(struct UnkStruct_02006D98 *param0, u32 param1) { param0->unk2E4 |= param1; } -THUMB_FUNC void FUN_02008290(struct UnkStruct_02006D98 *param0, u32 param1) +void FUN_02008290(struct UnkStruct_02006D98 *param0, u32 param1) { param0->unk2E4 &= (param1 ^ ~0); } -THUMB_FUNC void FUN_020082A8(struct UnkStruct_02006D98 *param0) +void FUN_020082A8(struct UnkStruct_02006D98 *param0) { NNSG2dCharacterData *st58; int st54; @@ -1528,7 +1528,7 @@ THUMB_FUNC void FUN_020082A8(struct UnkStruct_02006D98 *param0) param0->unk2E1 = st48; } -THUMB_FUNC void FUN_020086F4(struct UnkStruct_02006D98 *param0) +void FUN_020086F4(struct UnkStruct_02006D98 *param0) { NNSG2dPaletteData *st18; int st14, r7; @@ -1615,12 +1615,12 @@ THUMB_FUNC void FUN_020086F4(struct UnkStruct_02006D98 *param0) param0->unk2E2 = stc; } -THUMB_FUNC u8 FUN_020088D8(u8 param0) +u8 FUN_020088D8(u8 param0) { return (u8)(((u8)((param0 & 0xf0) >> 4)) | ((u8)(param0 << 4))); } -THUMB_FUNC void FUN_020088EC(struct UnkStruct_02006D98_2 *param0, u8 *param1) +void FUN_020088EC(struct UnkStruct_02006D98_2 *param0, u8 *param1) { if (param0->unk04.field_06 != 0) { @@ -1628,7 +1628,7 @@ THUMB_FUNC void FUN_020088EC(struct UnkStruct_02006D98_2 *param0, u8 *param1) } } -THUMB_FUNC void FUN_02008904(u8 *param0, u32 param1, u32 param2) +void FUN_02008904(u8 *param0, u32 param1, u32 param2) { const struct UnkStruct_02006D98_3 *st10; s32 i; @@ -1701,14 +1701,14 @@ THUMB_FUNC void FUN_02008904(u8 *param0, u32 param1, u32 param2) } } -THUMB_FUNC u16 FUN_02008A54(u32 *param0) +u16 FUN_02008A54(u32 *param0) { *param0 = (*param0) * 0x41C64E6D + 0x6073; return (u16)(*param0 >> 16); } -THUMB_FUNC void FUN_02008A74(u8 *param0) +void FUN_02008A74(u8 *param0) { u32 st0 = ((u16 *)param0)[0xc7f]; for (s32 r4 = 0xc7f; r4 > -1; r4--) diff --git a/arm9/src/unk_02008AA4.c b/arm9/src/unk_02008AA4.c index cf4e3be8e..9f831e6bd 100644 --- a/arm9/src/unk_02008AA4.c +++ b/arm9/src/unk_02008AA4.c @@ -12,7 +12,7 @@ extern void FUN_02021390(u32, u32 *); extern void FUN_0201D194(u32, u32, u32); extern void FUN_0201E068(u32, u32); -THUMB_FUNC void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, +void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, s32 param1, s32 param2, s32 param3, @@ -114,7 +114,7 @@ THUMB_FUNC void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, param0->unk20 = (u8)param8; } -THUMB_FUNC struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0, +struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0, u32 param1, struct UnkStruct_02008DEC_1 *param2, struct UnkStruct_02008DEC_1 *param3, @@ -156,7 +156,7 @@ THUMB_FUNC struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 return r6; } -THUMB_FUNC void FUN_02008C80(struct UnkStruct_02008AA4_1 *param0) +void FUN_02008C80(struct UnkStruct_02008AA4_1 *param0) { GF_ASSERT(param0); @@ -167,7 +167,7 @@ THUMB_FUNC void FUN_02008C80(struct UnkStruct_02008AA4_1 *param0) FreeToHeap(param0); } -THUMB_FUNC u32 FUN_02008C9C(u32 param0, void *param1, u32 param2) +u32 FUN_02008C9C(u32 param0, void *param1, u32 param2) { FUN_0202134C(param1, 0xFFFFF000); @@ -194,7 +194,7 @@ THUMB_FUNC u32 FUN_02008C9C(u32 param0, void *param1, u32 param2) return FUN_0201FCB0(st10); } -THUMB_FUNC void FUN_02008D04(u32 param0, u32 param1, u32 param2) +void FUN_02008D04(u32 param0, u32 param1, u32 param2) { u32 st0[4]; st0[0] = param1; @@ -204,7 +204,7 @@ THUMB_FUNC void FUN_02008D04(u32 param0, u32 param1, u32 param2) FUN_02021390(param0 + 0x98, st0); } -THUMB_FUNC void FUN_02008D24(u32 param0, u32 param1, u32 param2) +void FUN_02008D24(u32 param0, u32 param1, u32 param2) { u32 st0[4]; st0[0] = param1; @@ -214,7 +214,7 @@ THUMB_FUNC void FUN_02008D24(u32 param0, u32 param1, u32 param2) FUN_02021390(param0 + 0xe0, st0); } -THUMB_FUNC void FUN_02008D44(u32 param0, u32 param1) +void FUN_02008D44(u32 param0, u32 param1) { switch (param1) { @@ -243,7 +243,7 @@ THUMB_FUNC void FUN_02008D44(u32 param0, u32 param1) GF_AssertFail(); } -THUMB_FUNC void FUN_02008DDC(u32 param0) +void FUN_02008DDC(u32 param0) { FUN_0201E068(0xC000, param0); } diff --git a/arm9/src/unk_02008DEC.c b/arm9/src/unk_02008DEC.c index 2238b9208..ae4033def 100644 --- a/arm9/src/unk_02008DEC.c +++ b/arm9/src/unk_02008DEC.c @@ -31,7 +31,7 @@ extern u32 FUN_0201E258(s32, u32); extern u32 FUN_0201E230(s32); extern s32 NNS_G2dGetImagePaletteLocation(u32, u32); -THUMB_FUNC struct UnkStruct_02008DEC_1 *FUN_02008DEC(u32 param0, s32 param1, u32 heap_id) +struct UnkStruct_02008DEC_1 *FUN_02008DEC(u32 param0, s32 param1, u32 heap_id) { struct UnkStruct_02008DEC_1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02008DEC_1)); ptr->unk00 = FUN_02020C44(param0, heap_id); @@ -44,7 +44,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_1 *FUN_02008DEC(u32 param0, s32 param1, u32 return ptr; } -THUMB_FUNC void FUN_02008E2C(struct UnkStruct_02008DEC_1 *param0) +void FUN_02008E2C(struct UnkStruct_02008DEC_1 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk00); @@ -61,7 +61,7 @@ THUMB_FUNC void FUN_02008E2C(struct UnkStruct_02008DEC_1 *param0) FreeToHeap(param0); } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008E6C( +struct UnkStruct_02008DEC_sub *FUN_02008E6C( struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, u32 param3) { GF_ASSERT(param0); @@ -103,7 +103,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008E6C( return st1c; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F34(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02008F34(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -123,7 +123,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F34(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F90(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02008F90(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -144,7 +144,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F90(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008FEC(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02008FEC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -165,7 +165,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008FEC(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200904C(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_0200904C(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -187,7 +187,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200904C(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020090AC(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020090AC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -206,7 +206,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020090AC(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC void FUN_020090FC(struct UnkStruct_02008DEC_1 *param0, +void FUN_020090FC(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, @@ -225,7 +225,7 @@ THUMB_FUNC void FUN_020090FC(struct UnkStruct_02008DEC_1 *param0, FUN_02009978(param0, param1, param2, param3, param4, r6, r7, 0, 0, param5, FALSE); } -THUMB_FUNC void FUN_02009168(struct UnkStruct_02008DEC_1 *param0, +void FUN_02009168(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, @@ -245,7 +245,7 @@ THUMB_FUNC void FUN_02009168(struct UnkStruct_02008DEC_1 *param0, FUN_02009978(param0, param1, param2, param3, param4, r6, r7, st24, 1, param5, 0); } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020091E0(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020091E0(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -265,7 +265,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020091E0(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200923C(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_0200923C(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -286,7 +286,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200923C(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009298(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02009298(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -307,7 +307,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009298(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020092F8(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020092F8(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -329,7 +329,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020092F8(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009358(struct UnkStruct_02008DEC_1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02009358(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -348,7 +348,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009358(struct UnkStruct_02008DEC return r6; } -THUMB_FUNC s32 FUN_020093A8( +s32 FUN_020093A8( struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, u32 param3) { GF_ASSERT(param0); @@ -359,7 +359,7 @@ THUMB_FUNC s32 FUN_020093A8( return param1->unk04; } -THUMB_FUNC void FUN_020093DC(struct UnkStruct_02008DEC_1 *param0, +void FUN_020093DC(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, s32 param3, @@ -378,7 +378,7 @@ THUMB_FUNC void FUN_020093DC(struct UnkStruct_02008DEC_1 *param0, } } -THUMB_FUNC struct UnkStruct_02008DEC_5 *FUN_02009424(s32 param0, u32 param1) +struct UnkStruct_02008DEC_5 *FUN_02009424(s32 param0, u32 param1) { struct UnkStruct_02008DEC_5 *r4 = AllocFromHeap(param1, sizeof(struct UnkStruct_02008DEC_5)); r4->unk00 = AllocFromHeap(param1, param0 * sizeof(struct UnkStruct_02008DEC_sub *)); @@ -388,19 +388,19 @@ THUMB_FUNC struct UnkStruct_02008DEC_5 *FUN_02009424(s32 param0, u32 param1) return r4; } -THUMB_FUNC void FUN_02009448(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009448(struct UnkStruct_02008DEC_5 *param0) { FreeToHeap(param0->unk00); FreeToHeap(param0); } -THUMB_FUNC u32 FUN_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1) +u32 FUN_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1) { GF_ASSERT(param0); return FUN_02020CB0(param0->unk00, param1); } -THUMB_FUNC void FUN_02009474(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009474(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -408,7 +408,7 @@ THUMB_FUNC void FUN_02009474(struct UnkStruct_02008DEC_sub *param0) FUN_02020E1C(param0->unk00, 0); } -THUMB_FUNC void FUN_02009490(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1) +void FUN_02009490(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04); @@ -419,7 +419,7 @@ THUMB_FUNC void FUN_02009490(struct UnkStruct_02008DEC_1 *param0, struct UnkStru param0->unk0C--; } -THUMB_FUNC void FUN_020094C4(struct UnkStruct_02008DEC_1 *param0) +void FUN_020094C4(struct UnkStruct_02008DEC_1 *param0) { for (int i = 0; i < param0->unk08; i++) { @@ -430,7 +430,7 @@ THUMB_FUNC void FUN_020094C4(struct UnkStruct_02008DEC_1 *param0) } } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020094F0(struct UnkStruct_02008DEC_1 *param0, s32 param1) +struct UnkStruct_02008DEC_sub *FUN_020094F0(struct UnkStruct_02008DEC_1 *param0, s32 param1) { GF_ASSERT(param0); @@ -449,56 +449,56 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020094F0(struct UnkStruct_02008DEC return NULL; } -THUMB_FUNC s32 FUN_02009530(struct UnkStruct_02008DEC_sub *param0) +s32 FUN_02009530(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); return FUN_02020E38(param0->unk00); } -THUMB_FUNC u32 FUN_02009544(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009544(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 0); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_0200955C(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_0200955C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 1); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_02009574(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009574(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 2); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_0200958C(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_0200958C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 3); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095A4(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_020095A4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 4); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095BC(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_020095BC(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 5); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095D4(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_020095D4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); return param0->unk04; } -THUMB_FUNC u32 FUN_020095E4(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_020095E4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -514,7 +514,7 @@ THUMB_FUNC u32 FUN_020095E4(struct UnkStruct_02008DEC_sub *param0) return 0; } -THUMB_FUNC u32 FUN_02009610(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009610(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -526,7 +526,7 @@ THUMB_FUNC u32 FUN_02009610(struct UnkStruct_02008DEC_sub *param0) return 0; } -THUMB_FUNC void FUN_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1) +void FUN_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1) { GF_ASSERT(param0); @@ -540,17 +540,17 @@ THUMB_FUNC void FUN_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1) } } -THUMB_FUNC u32 FUN_0200965C(void) +u32 FUN_0200965C(void) { return 16; } -THUMB_FUNC struct UnkStruct_02008DEC_2 *FUN_02009660(struct UnkStruct_02008DEC_2 *param0, s32 param1) +struct UnkStruct_02008DEC_2 *FUN_02009660(struct UnkStruct_02008DEC_2 *param0, s32 param1) { return ¶m0[param1]; } -THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, u32 param2) +void FUN_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, u32 param2) { GF_ASSERT(param1); @@ -574,7 +574,7 @@ THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, u } } -THUMB_FUNC void FUN_020096B4(struct UnkStruct_02008DEC_2 *param0) +void FUN_020096B4(struct UnkStruct_02008DEC_2 *param0) { if (param0->unk00_4) { @@ -584,14 +584,14 @@ THUMB_FUNC void FUN_020096B4(struct UnkStruct_02008DEC_2 *param0) param0->unk04 = 0; } -THUMB_FUNC s32 FUN_020096CC(struct UnkStruct_02008DEC_2 *param0) +s32 FUN_020096CC(struct UnkStruct_02008DEC_2 *param0) { GF_ASSERT(param0); return param0->unk04; } -THUMB_FUNC s32 FUN_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1) +s32 FUN_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -604,7 +604,7 @@ THUMB_FUNC s32 FUN_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1) return param0->unk00_4[param1].unk0C; } -THUMB_FUNC s32 FUN_02009710(struct UnkStruct_02008DEC_2 *param0, s32 param1) +s32 FUN_02009710(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -619,7 +619,7 @@ THUMB_FUNC s32 FUN_02009710(struct UnkStruct_02008DEC_2 *param0, s32 param1) return r6; } -THUMB_FUNC BOOL FUN_0200973C(struct UnkStruct_02008DEC_2 *param0, s32 param1) +BOOL FUN_0200973C(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -634,7 +634,7 @@ THUMB_FUNC BOOL FUN_0200973C(struct UnkStruct_02008DEC_2 *param0, s32 param1) return r6; } -THUMB_FUNC u32 FUN_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1) +u32 FUN_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -647,7 +647,7 @@ THUMB_FUNC u32 FUN_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1) return param0->unk00_4[param1].unk10; } -THUMB_FUNC u32 FUN_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1) +u32 FUN_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -660,7 +660,7 @@ THUMB_FUNC u32 FUN_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1) return param0->unk00_4[param1].unk14; } -THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020097D0(struct UnkStruct_02008DEC_1 *param0) +struct UnkStruct_02008DEC_sub *FUN_020097D0(struct UnkStruct_02008DEC_1 *param0) { for (int i = 0; i < param0->unk08; i++) { @@ -673,7 +673,7 @@ THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020097D0(struct UnkStruct_02008DEC return NULL; } -THUMB_FUNC void FUN_020097FC( +void FUN_020097FC( struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4) { void *r0 = FUN_02020E0C(param0->unk00); @@ -701,7 +701,7 @@ THUMB_FUNC void FUN_020097FC( } } -THUMB_FUNC struct CharacterData_02008DEC *FUN_0200986C(void *param0, u32 param1, u32 param2) +struct CharacterData_02008DEC *FUN_0200986C(void *param0, u32 param1, u32 param2) { struct CharacterData_02008DEC *ptr = AllocFromHeap(param2, sizeof(struct CharacterData_02008DEC)); @@ -712,7 +712,7 @@ THUMB_FUNC struct CharacterData_02008DEC *FUN_0200986C(void *param0, u32 param1, return ptr; } -THUMB_FUNC struct PaletteData_02008DEC *FUN_0200988C( +struct PaletteData_02008DEC *FUN_0200988C( void *param0, u32 param1, u32 param2, u32 param3) { struct PaletteData_02008DEC *ptr = AllocFromHeap(param3, sizeof(struct PaletteData_02008DEC)); @@ -724,7 +724,7 @@ THUMB_FUNC struct PaletteData_02008DEC *FUN_0200988C( return ptr; } -THUMB_FUNC struct CellDataBank_02008DEC *FUN_020098B0(void *param0, u32 param1) +struct CellDataBank_02008DEC *FUN_020098B0(void *param0, u32 param1) { struct CellDataBank_02008DEC *ptr = AllocFromHeap(param1, sizeof(struct CellDataBank_02008DEC)); @@ -733,7 +733,7 @@ THUMB_FUNC struct CellDataBank_02008DEC *FUN_020098B0(void *param0, u32 param1) return ptr; } -THUMB_FUNC struct AnimBank_02008DEC *FUN_020098CC(void *param0, u32 param1) +struct AnimBank_02008DEC *FUN_020098CC(void *param0, u32 param1) { struct AnimBank_02008DEC *ptr = AllocFromHeap(param1, sizeof(struct AnimBank_02008DEC)); @@ -742,7 +742,7 @@ THUMB_FUNC struct AnimBank_02008DEC *FUN_020098CC(void *param0, u32 param1) return ptr; } -THUMB_FUNC void *FUN_020098E8(void *param0, u32 param1) +void *FUN_020098E8(void *param0, u32 param1) { void *ptr = AllocFromHeap(param1, 4); @@ -751,7 +751,7 @@ THUMB_FUNC void *FUN_020098E8(void *param0, u32 param1) return ptr; } -THUMB_FUNC void *FUN_02009904(void *param0, u32 param1) +void *FUN_02009904(void *param0, u32 param1) { void *ptr = AllocFromHeap(param1, 4); @@ -760,7 +760,7 @@ THUMB_FUNC void *FUN_02009904(void *param0, u32 param1) return ptr; } -THUMB_FUNC void FUN_02009920(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009920(struct UnkStruct_02008DEC_sub *param0) { if (param0->unk08 != NULL) { @@ -770,7 +770,7 @@ THUMB_FUNC void FUN_02009920(struct UnkStruct_02008DEC_sub *param0) param0->unk08 = NULL; } -THUMB_FUNC u32 *FUN_02009934(struct UnkStruct_02008DEC_sub *param0) +u32 *FUN_02009934(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk08); @@ -778,7 +778,7 @@ THUMB_FUNC u32 *FUN_02009934(struct UnkStruct_02008DEC_sub *param0) return param0->unk08; } -THUMB_FUNC void FUN_0200994C(struct UnkStruct_02008DEC_1 *param0, +void FUN_0200994C(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, void *param2, s32 param3, @@ -792,7 +792,7 @@ THUMB_FUNC void FUN_0200994C(struct UnkStruct_02008DEC_1 *param0, FUN_020097FC(param1, param6, param4, param5, param7); } -THUMB_FUNC void FUN_02009978(struct UnkStruct_02008DEC_1 *param0, +void FUN_02009978(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, @@ -811,7 +811,7 @@ THUMB_FUNC void FUN_02009978(struct UnkStruct_02008DEC_1 *param0, FUN_020097FC(param1, param8, param6, param7, param9); } -THUMB_FUNC void FUN_020099B0(struct UnkStruct_02008DEC_1 *param0, +void FUN_020099B0(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1, NARC *param2, u32 param3, @@ -830,7 +830,7 @@ THUMB_FUNC void FUN_020099B0(struct UnkStruct_02008DEC_1 *param0, FUN_020097FC(param1, param8, param6, param7, param9); } -THUMB_FUNC s32 FUN_020099E8(struct UnkStruct_02008DEC_4 *param0) +s32 FUN_020099E8(struct UnkStruct_02008DEC_4 *param0) { s32 r3 = 0; while (param0[r3].unk00 != -2) @@ -841,7 +841,7 @@ THUMB_FUNC s32 FUN_020099E8(struct UnkStruct_02008DEC_4 *param0) return r3; } -THUMB_FUNC void *FUN_02009A04(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4) +void *FUN_02009A04(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4) { void *r4 = NARC_AllocAndReadWholeMember(param0, param1, param3); @@ -869,7 +869,7 @@ THUMB_FUNC void *FUN_02009A04(NARC *param0, u32 param1, u32 param2, u32 param3, return r4; } -THUMB_FUNC u32 FUN_02009A50(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009A50(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -883,7 +883,7 @@ THUMB_FUNC u32 FUN_02009A50(struct UnkStruct_02008DEC_sub *param0) return FUN_0201D1F8(st0); } -THUMB_FUNC void FUN_02009A90(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009A90(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); @@ -893,7 +893,7 @@ THUMB_FUNC void FUN_02009A90(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC u32 FUN_02009AC4(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009AC4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -907,7 +907,7 @@ THUMB_FUNC u32 FUN_02009AC4(struct UnkStruct_02008DEC_sub *param0) return FUN_0201D250(st0); } -THUMB_FUNC u32 FUN_02009B04(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009B04(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -921,7 +921,7 @@ THUMB_FUNC u32 FUN_02009B04(struct UnkStruct_02008DEC_sub *param0) return FUN_0201D1F8(st0); } -THUMB_FUNC void FUN_02009B44(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009B44(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); @@ -931,7 +931,7 @@ THUMB_FUNC void FUN_02009B44(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC u32 FUN_02009B78(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009B78(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -945,7 +945,7 @@ THUMB_FUNC u32 FUN_02009B78(struct UnkStruct_02008DEC_sub *param0) return FUN_0201D250(st0); } -THUMB_FUNC void FUN_02009BB8(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) +void FUN_02009BB8(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -953,14 +953,14 @@ THUMB_FUNC void FUN_02009BB8(struct UnkStruct_02008DEC_sub *param0, struct UnkSt FUN_0201D2DC(FUN_02009530(param0), FUN_02009544(param1)); } -THUMB_FUNC void FUN_02009BE8(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009BE8(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); FUN_0201D2DC(FUN_02009530(param0), FUN_02009544(param0)); } -THUMB_FUNC void FUN_02009C0C(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009C0C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -968,7 +968,7 @@ THUMB_FUNC void FUN_02009C0C(struct UnkStruct_02008DEC_sub *param0) FUN_0201D324(FUN_02009530(param0)); } -THUMB_FUNC void FUN_02009C30(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009C30(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -980,7 +980,7 @@ THUMB_FUNC void FUN_02009C30(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009C5C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -988,7 +988,7 @@ THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct_02008DEC_sub *param0) return FUN_0201D3B0(FUN_02009530(param0)); } -THUMB_FUNC u32 FUN_02009C80(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) +u32 FUN_02009C80(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -1006,14 +1006,14 @@ THUMB_FUNC u32 FUN_02009C80(struct UnkStruct_02008DEC_sub *param0, struct UnkStr return r0; } -THUMB_FUNC void FUN_02009CDC(u32 param0) +void FUN_02009CDC(u32 param0) { GF_ASSERT(param0); FUN_0201D4F0(param0); } -THUMB_FUNC u32 FUN_02009CF0(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009CF0(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1027,7 +1027,7 @@ THUMB_FUNC u32 FUN_02009CF0(struct UnkStruct_02008DEC_sub *param0) return FUN_0201E0E4(st0); } -THUMB_FUNC void FUN_02009D34(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009D34(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1039,7 +1039,7 @@ THUMB_FUNC void FUN_02009D34(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC u32 FUN_02009D68(struct UnkStruct_02008DEC_sub *param0) +u32 FUN_02009D68(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1053,7 +1053,7 @@ THUMB_FUNC u32 FUN_02009D68(struct UnkStruct_02008DEC_sub *param0) return FUN_0201E128(st0); } -THUMB_FUNC void FUN_02009DAC(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009DAC(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1065,14 +1065,14 @@ THUMB_FUNC void FUN_02009DAC(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC void FUN_02009DE0(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009DE0(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); FUN_0201E168(FUN_02009530(param0), FUN_0200955C(param0)); } -THUMB_FUNC void FUN_02009E04(struct UnkStruct_02008DEC_sub *param0) +void FUN_02009E04(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1080,7 +1080,7 @@ THUMB_FUNC void FUN_02009E04(struct UnkStruct_02008DEC_sub *param0) FUN_0201E1C8(FUN_02009530(param0)); } -THUMB_FUNC void FUN_02009E28(struct UnkStruct_02008DEC_5 *param0) +void FUN_02009E28(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1092,7 +1092,7 @@ THUMB_FUNC void FUN_02009E28(struct UnkStruct_02008DEC_5 *param0) } } -THUMB_FUNC u32 FUN_02009E54(struct UnkStruct_02008DEC_sub *param0, u32 param1) +u32 FUN_02009E54(struct UnkStruct_02008DEC_sub *param0, u32 param1) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1106,7 +1106,7 @@ THUMB_FUNC u32 FUN_02009E54(struct UnkStruct_02008DEC_sub *param0, u32 param1) return FUN_0201E230(r0); } -THUMB_FUNC s32 FUN_02009E88(struct UnkStruct_02008DEC_sub *param0, u32 param1) +s32 FUN_02009E88(struct UnkStruct_02008DEC_sub *param0, u32 param1) { s32 ret = NNS_G2dGetImagePaletteLocation(FUN_02009E54(param0, 0), param1); if (ret != -1) diff --git a/arm9/src/unk_0200BA78.c b/arm9/src/unk_0200BA78.c index 70b2f3471..b95e63380 100644 --- a/arm9/src/unk_0200BA78.c +++ b/arm9/src/unk_0200BA78.c @@ -2,7 +2,7 @@ #include "unk_0200BA78.h" #include "message_format.h" -THUMB_FUNC void FUN_0200BA78(struct UnkStruct_0200B870 *param0, +void FUN_0200BA78(struct UnkStruct_0200B870 *param0, int param1, u32 value, u32 n, @@ -15,7 +15,7 @@ THUMB_FUNC void FUN_0200BA78(struct UnkStruct_0200B870 *param0, FUN_0200B9EC(param0, value, n, mode, window, x + 16, y); } -THUMB_FUNC void FUN_0200BAAC( +void FUN_0200BAAC( struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PrintingMode mode, void *dest) { u8 st0 = (u8)((param0->unk_28 << 4) | param0->unk_28); diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c index 093d35c18..fc882ea97 100644 --- a/arm9/src/unk_0200BB14.c +++ b/arm9/src/unk_0200BB14.c @@ -54,7 +54,7 @@ extern void FUN_02020054(u32 param0, u32 *param1); extern void FUN_02020358(u32 param0, u32 param1); extern void FUN_02020398(u32 param0, u32 param1); -THUMB_FUNC struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id) +struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id) { struct UnkStruct_0200BB14_1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0200BB14_1)); if (ptr == NULL) @@ -69,7 +69,7 @@ THUMB_FUNC struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id) return ptr; } -THUMB_FUNC struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0) +struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0) { GF_ASSERT(param0 != NULL); @@ -90,12 +90,12 @@ THUMB_FUNC struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 return ptr; } -THUMB_FUNC u32 FUN_0200BB68(u32 param0) +u32 FUN_0200BB68(u32 param0) { return param0 + 0x10; } -THUMB_FUNC BOOL FUN_0200BB6C( +BOOL FUN_0200BB6C( struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3) { GF_ASSERT(param0 != NULL); @@ -131,7 +131,7 @@ THUMB_FUNC BOOL FUN_0200BB6C( return TRUE; } -THUMB_FUNC BOOL FUN_0200BBF0( +BOOL FUN_0200BBF0( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2) { if (param0 == NULL || param1 == NULL) @@ -144,34 +144,34 @@ THUMB_FUNC BOOL FUN_0200BBF0( return TRUE; } -THUMB_FUNC void FUN_0200BC14(u32 param0) +void FUN_0200BC14(u32 param0) { FUN_0201FFC8(param0); } -THUMB_FUNC void FUN_0200BC1C(u32 *param0) +void FUN_0200BC1C(u32 *param0) { GF_ASSERT(param0 != NULL); FUN_0201FDEC(*param0); } -THUMB_FUNC void FUN_0200BC30() +void FUN_0200BC30() { ApplyAndResetOamManagerBuffer(); } -THUMB_FUNC void FUN_0200BC38() +void FUN_0200BC38() { FUN_0201C348(); } -THUMB_FUNC void FUN_0200BC40(struct UnkStruct_0200BB14_2 *param0) +void FUN_0200BC40(struct UnkStruct_0200BB14_2 *param0) { FUN_0201FD58(param0->unk00); } -THUMB_FUNC void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0) +void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0) { if (param0->unk04 != 0) { @@ -179,7 +179,7 @@ THUMB_FUNC void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0) } } -THUMB_FUNC void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0) +void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0) { for (s32 i = 0; i < param0->unk54; i++) { @@ -197,7 +197,7 @@ THUMB_FUNC void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0) } } -THUMB_FUNC void FUN_0200BCB0(u32 *param0) +void FUN_0200BCB0(u32 *param0) { FUN_0201C350(param0[3]); FUN_0201D12C(); @@ -209,14 +209,14 @@ THUMB_FUNC void FUN_0200BCB0(u32 *param0) } } -THUMB_FUNC void FUN_0200BCD0( +void FUN_0200BCD0( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) { param0->unk004--; FreeToHeap(param1); } -THUMB_FUNC void FUN_0200BCE0( +void FUN_0200BCE0( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) { FUN_0200BC40(param1); @@ -225,14 +225,14 @@ THUMB_FUNC void FUN_0200BCE0( FUN_0200BCD0(param0, param1); } -THUMB_FUNC void FUN_0200BD04(u32 *param0) +void FUN_0200BD04(u32 *param0) { GF_ASSERT(param0[1] == 0); FUN_0200BCB0(param0); FreeToHeap(param0); } -THUMB_FUNC BOOL FUN_0200BD20( +BOOL FUN_0200BD20( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2) { s32 st14 = 6; @@ -290,7 +290,7 @@ THUMB_FUNC BOOL FUN_0200BD20( return TRUE; } -THUMB_FUNC u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2) +u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2) { return FUN_0200BE74(param0, param1, @@ -308,7 +308,7 @@ THUMB_FUNC u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_ param2->unk24); } -THUMB_FUNC u32 FUN_0200BE74(u32 *param0, +u32 FUN_0200BE74(u32 *param0, u32 *param1, u32 param2, s16 param3, @@ -387,7 +387,7 @@ THUMB_FUNC u32 FUN_0200BE74(u32 *param0, return r4; } -THUMB_FUNC BOOL FUN_0200BF60( +BOOL FUN_0200BF60( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, s32 *param2) { struct UnkStruct_0200BB14_1 *st0 = param0; @@ -428,7 +428,7 @@ THUMB_FUNC BOOL FUN_0200BF60( return TRUE; } -THUMB_FUNC BOOL FUN_0200C00C(u32 *param0, +BOOL FUN_0200C00C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -453,7 +453,7 @@ THUMB_FUNC BOOL FUN_0200C00C(u32 *param0, return r5 != NULL ? TRUE : FALSE; } -THUMB_FUNC s32 FUN_0200C06C(u32 *param0, +s32 FUN_0200C06C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -480,7 +480,7 @@ THUMB_FUNC s32 FUN_0200C06C(u32 *param0, return -1; } -THUMB_FUNC u8 FUN_0200C0DC(u32 param0, +u8 FUN_0200C0DC(u32 param0, u32 param1, u32 *param2, struct UnkStruct_0200BB14_2 *param3, @@ -500,7 +500,7 @@ THUMB_FUNC u8 FUN_0200C0DC(u32 param0, return (u8)r4; } -THUMB_FUNC BOOL FUN_0200C124(u32 *param0, +BOOL FUN_0200C124(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -510,7 +510,7 @@ THUMB_FUNC BOOL FUN_0200C124(u32 *param0, return FUN_0200C404(param0, param1, param2, param3, param4, 2, param5); } -THUMB_FUNC BOOL FUN_0200C13C(u32 *param0, +BOOL FUN_0200C13C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -520,7 +520,7 @@ THUMB_FUNC BOOL FUN_0200C13C(u32 *param0, return FUN_0200C404(param0, param1, param2, param3, param4, 3, param5); } -THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154( +struct UnkStruct_0200BB14_5 *FUN_0200C154( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2) { struct UnkStruct_0200BB14_4 st44; @@ -654,37 +654,37 @@ THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154( return ptr; } -THUMB_FUNC u32 FUN_0200C334(struct UnkStruct_02008DEC_1 **param0, s32 param1) +u32 FUN_0200C334(struct UnkStruct_02008DEC_1 **param0, s32 param1) { return FUN_02009E54(FUN_020094F0(param0[4], param1), 0); } -THUMB_FUNC s32 FUN_0200C344(struct UnkStruct_02008DEC_1 **param0, s32 param1, u32 param2) +s32 FUN_0200C344(struct UnkStruct_02008DEC_1 **param0, s32 param1, u32 param2) { return FUN_02009E88(FUN_020094F0(param0[4], param1), param2); } -THUMB_FUNC BOOL FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1) +BOOL FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1) { return FUN_0200C4F4(param0->unk0c[0], param0->unk24[0], param1); } -THUMB_FUNC BOOL FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1) +BOOL FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1) { return FUN_0200C548(param0->unk0c[1], param0->unk24[1], param1); } -THUMB_FUNC BOOL FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1) +BOOL FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1) { return FUN_0200C4A8(param0->unk0c[2], param0->unk24[2], param1); } -THUMB_FUNC BOOL FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1) +BOOL FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1) { return FUN_0200C4A8(param0->unk0c[3], param0->unk24[3], param1); } -THUMB_FUNC void FUN_0200C398( +void FUN_0200C398( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) { FUN_0200BC40(param1); @@ -700,7 +700,7 @@ THUMB_FUNC void FUN_0200C398( FUN_0200BCD0(param0, param1); } -THUMB_FUNC void FUN_0200C3DC(u32 *param0) +void FUN_0200C3DC(u32 *param0) { if (param0[3] != 0) { @@ -712,7 +712,7 @@ THUMB_FUNC void FUN_0200C3DC(u32 *param0) FreeToHeap(param0); } -THUMB_FUNC BOOL FUN_0200C404(u32 *param0, +BOOL FUN_0200C404(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -736,7 +736,7 @@ THUMB_FUNC BOOL FUN_0200C404(u32 *param0, return r5 != NULL ? TRUE : FALSE; } -THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct_02008DEC_5 *param0, struct UnkStruct_02008DEC_sub *param1) +BOOL FUN_0200C474(struct UnkStruct_02008DEC_5 *param0, struct UnkStruct_02008DEC_sub *param1) { for (s32 i = 0; i < param0->unk04; i++) { @@ -751,7 +751,7 @@ THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct_02008DEC_5 *param0, struct UnkStru return FALSE; } -THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) +BOOL FUN_0200C4A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -773,7 +773,7 @@ THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStru return FALSE; } -THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) +BOOL FUN_0200C4F4(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -796,7 +796,7 @@ THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct_02008DEC_1 *param0, struct UnkStru return FALSE; } -THUMB_FUNC BOOL FUN_0200C548(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) +BOOL FUN_0200C548(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -819,162 +819,162 @@ THUMB_FUNC BOOL FUN_0200C548(struct UnkStruct_02008DEC_1 *param0, struct UnkStru return FALSE; } -THUMB_FUNC void FUN_0200C59C(u32 param0) +void FUN_0200C59C(u32 param0) { FUN_020201E4(param0, 0x1000); } -THUMB_FUNC void FUN_0200C5A8(u32 *param0) +void FUN_0200C5A8(u32 *param0) { FUN_0200C59C(param0[0]); } -THUMB_FUNC void FUN_0200C5B4(u32 *param0, u32 param1) +void FUN_0200C5B4(u32 *param0, u32 param1) { FUN_020201E4(param0[0], param1); } -THUMB_FUNC void FUN_0200C5C0(u32 *param0, u32 param1) +void FUN_0200C5C0(u32 *param0, u32 param1) { FUN_02020130(param0[0], param1); } -THUMB_FUNC u32 FUN_0200C5CC(u32 *param0) +u32 FUN_0200C5CC(u32 *param0) { return FUN_020201DC(param0[0]); } -THUMB_FUNC void FUN_0200C5D8(u32 param0, u32 param1) +void FUN_0200C5D8(u32 param0, u32 param1) { FUN_020200BC(param0, param1); } -THUMB_FUNC void FUN_0200C5E0(u32 *param0, u32 param1) +void FUN_0200C5E0(u32 *param0, u32 param1) { FUN_0200C5D8(param0[0], param1); } -THUMB_FUNC void FUN_0200C5EC(u32 param0, u32 param1) +void FUN_0200C5EC(u32 param0, u32 param1) { FUN_020200D8(param0, param1); } -THUMB_FUNC void FUN_0200C5F4(u32 *param0, u32 param1) +void FUN_0200C5F4(u32 *param0, u32 param1) { FUN_0200C5EC(*param0, param1); } -THUMB_FUNC u32 FUN_0200C600(u32 param0) +u32 FUN_0200C600(u32 param0) { return FUN_02020388(param0); } -THUMB_FUNC u32 FUN_0200C608(u32 *param0) +u32 FUN_0200C608(u32 *param0) { return FUN_0200C600(*param0); } -THUMB_FUNC void FUN_0200C614(u32 param0) +void FUN_0200C614(u32 param0) { FUN_02020208(param0); } -THUMB_FUNC void FUN_0200C61C(u32 *param0) +void FUN_0200C61C(u32 *param0) { FUN_0200C614(*param0); } -THUMB_FUNC void FUN_0200C628(u32 param0) +void FUN_0200C628(u32 param0) { FUN_0202022C(param0); } -THUMB_FUNC void FUN_0200C630(u32 *param0) +void FUN_0200C630(u32 *param0) { FUN_0200C628(*param0); } -THUMB_FUNC void FUN_0200C63C(u32 param0, u32 param1) +void FUN_0200C63C(u32 param0, u32 param1) { FUN_020200A0(param0, param1); } -THUMB_FUNC void FUN_0200C644(u32 *param0, u32 param1) +void FUN_0200C644(u32 *param0, u32 param1) { FUN_0200C63C(*param0, param1); } -THUMB_FUNC u8 FUN_0200C650(u32 param0) +u8 FUN_0200C650(u32 param0) { return FUN_02020128(param0); } -THUMB_FUNC u8 FUN_0200C658(u32 *param0) +u8 FUN_0200C658(u32 *param0) { return FUN_0200C650(*param0); } -THUMB_FUNC void FUN_0200C664(u32 param0, u32 param1) +void FUN_0200C664(u32 param0, u32 param1) { FUN_02020248(param0, param1); } -THUMB_FUNC void FUN_0200C66C(u32 *param0, u32 param1) +void FUN_0200C66C(u32 *param0, u32 param1) { FUN_0200C664(*param0, param1); } -THUMB_FUNC void FUN_0200C678(u32 param0, u32 param1) +void FUN_0200C678(u32 param0, u32 param1) { FUN_020202A8(param0, param1); } -THUMB_FUNC void FUN_0200C680(u32 *param0, u32 param1) +void FUN_0200C680(u32 *param0, u32 param1) { FUN_0200C678(*param0, param1); } -THUMB_FUNC u8 FUN_0200C68C(u32 *param0) +u8 FUN_0200C68C(u32 *param0) { return FUN_02020300(*param0); } -THUMB_FUNC void FUN_0200C698(u32 param0, u32 param1) +void FUN_0200C698(u32 param0, u32 param1) { FUN_02020238(param0, (u8)param1); } -THUMB_FUNC u8 FUN_0200C6A4(u32 *param0) +u8 FUN_0200C6A4(u32 *param0) { return FUN_02020240(*param0); } -THUMB_FUNC void FUN_0200C6B0(u32 *param0, u32 param1) +void FUN_0200C6B0(u32 *param0, u32 param1) { FUN_0200C698(*param0, param1); } -THUMB_FUNC void FUN_0200C6BC(u32 param0, u32 param1) +void FUN_0200C6BC(u32 param0, u32 param1) { FUN_02020310(param0, param1); } -THUMB_FUNC void FUN_0200C6C4(u32 *param0, u32 param1) +void FUN_0200C6C4(u32 *param0, u32 param1) { FUN_0200C6BC(*param0, param1); } -THUMB_FUNC u16 FUN_0200C6D0(u32 param0) +u16 FUN_0200C6D0(u32 param0) { return FUN_0202032C(param0); } -THUMB_FUNC u16 FUN_0200C6D8(u32 *param0) +u16 FUN_0200C6D8(u32 *param0) { return FUN_0200C6D0(*param0); } -THUMB_FUNC void FUN_0200C6E4(u32 param0, u32 param1, u32 param2) +void FUN_0200C6E4(u32 param0, u32 param1, u32 param2) { u32 st0[3]; st0[0] = param1 << 12; @@ -988,12 +988,12 @@ THUMB_FUNC void FUN_0200C6E4(u32 param0, u32 param1, u32 param2) FUN_02020044(param0, st0); } -THUMB_FUNC void FUN_0200C714(u32 *param0, u32 param1, u32 param2) +void FUN_0200C714(u32 *param0, u32 param1, u32 param2) { FUN_0200C6E4(*param0, param1, param2); } -THUMB_FUNC void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3) +void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3) { u32 st0[3]; @@ -1008,12 +1008,12 @@ THUMB_FUNC void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3) FUN_02020044(param0, st0); } -THUMB_FUNC void FUN_0200C750(u32 *param0, u32 param1, u32 param2, u32 param3) +void FUN_0200C750(u32 *param0, u32 param1, u32 param2, u32 param3) { FUN_0200C720(*param0, param1, param2, param3); } -THUMB_FUNC void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2) +void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2) { s32 *r4 = FUN_0202011C(param0, param1, param2); @@ -1031,12 +1031,12 @@ THUMB_FUNC void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2) param2[0] = (u16)(r4[1] / 0x1000); } -THUMB_FUNC void FUN_0200C7A0(u32 *param0, u16 *param1, u16 *param2) +void FUN_0200C7A0(u32 *param0, u16 *param1, u16 *param2) { FUN_0200C75C(*param0, param1, param2); } -THUMB_FUNC void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, s32 param3) +void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, s32 param3) { s32 *r4 = FUN_0202011C(param0, param1, param2); @@ -1054,12 +1054,12 @@ THUMB_FUNC void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, s32 param3) param2[0] = (u16)(r4[1] / 0x1000); } -THUMB_FUNC void FUN_0200C7F0(u32 *param0, u16 *param1, u16 *param2, s32 param3) +void FUN_0200C7F0(u32 *param0, u16 *param1, u16 *param2, s32 param3) { FUN_0200C7AC(*param0, param1, param2, param3); } -THUMB_FUNC void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2) +void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2) { u32 st0[3]; @@ -1072,22 +1072,22 @@ THUMB_FUNC void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2) FUN_02020044(param0, st0); } -THUMB_FUNC void FUN_0200C82C(u32 *param0, u16 *param1, u16 *param2) +void FUN_0200C82C(u32 *param0, u16 *param1, u16 *param2) { FUN_0200C7FC(*param0, param1, param2); } -THUMB_FUNC void FUN_0200C838(u32 param0, u32 param1) +void FUN_0200C838(u32 param0, u32 param1) { FUN_020200EC(param0, param1); } -THUMB_FUNC void FUN_0200C840(u32 *param0, u32 param1) +void FUN_0200C840(u32 *param0, u32 param1) { FUN_0200C838(*param0, param1); } -THUMB_FUNC void FUN_0200C84C(u32 param0, f32 param1, f32 param2) +void FUN_0200C84C(u32 param0, f32 param1, f32 param2) { s32 *r4 = FUN_02020120(param0); @@ -1097,44 +1097,44 @@ THUMB_FUNC void FUN_0200C84C(u32 param0, f32 param1, f32 param2) FUN_02020064(param0, r4); } -THUMB_FUNC void FUN_0200C884(u32 *param0, f32 param1, f32 param2) +void FUN_0200C884(u32 *param0, f32 param1, f32 param2) { FUN_0200C84C(*param0, param1, param2); } -THUMB_FUNC void FUN_0200C890(u32 param0, u16 param1) +void FUN_0200C890(u32 param0, u16 param1) { FUN_02020088(param0, param1); } -THUMB_FUNC void FUN_0200C898(u32 *param0, u16 param1) +void FUN_0200C898(u32 *param0, u16 param1) { FUN_0200C890(*param0, param1); } -THUMB_FUNC void FUN_0200C8A4(u32 param0, u32 param1) +void FUN_0200C8A4(u32 param0, u32 param1) { u16 r0 = FUN_02020124(param0); r0 += param1; FUN_02020088(param0, r0); } -THUMB_FUNC void FUN_0200C8BC(u32 *param0, u32 param1) +void FUN_0200C8BC(u32 *param0, u32 param1) { FUN_0200C8A4(*param0, param1); } -THUMB_FUNC void FUN_0200C8C8(u32 param0, u32 param1) +void FUN_0200C8C8(u32 param0, u32 param1) { FUN_02020100(param0, param1); } -THUMB_FUNC void FUN_0200C8D0(u32 *param0, u32 param1) +void FUN_0200C8D0(u32 *param0, u32 param1) { FUN_0200C8C8(*param0, param1); } -THUMB_FUNC void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2) +void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2) { u32 st0[3]; st0[0] = param1 << 12; @@ -1144,22 +1144,22 @@ THUMB_FUNC void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2) FUN_02020054(*param0, st0); } -THUMB_FUNC void FUN_0200C8F8(u32 *param0, u32 param1) +void FUN_0200C8F8(u32 *param0, u32 param1) { FUN_02020358(*param0, param1); } -THUMB_FUNC void FUN_0200C904(u32 param0, u32 param1) +void FUN_0200C904(u32 param0, u32 param1) { FUN_02020398(param0, param1); } -THUMB_FUNC void FUN_0200C90C(u32 *param0, u32 param1) +void FUN_0200C90C(u32 *param0, u32 param1) { FUN_0200C904(*param0, param1); } -THUMB_FUNC BOOL FUN_0200C918(u32 *param0, +BOOL FUN_0200C918(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -1185,7 +1185,7 @@ THUMB_FUNC BOOL FUN_0200C918(u32 *param0, return r5 != NULL ? TRUE : FALSE; } -THUMB_FUNC BOOL FUN_0200C978(u32 *param0, +BOOL FUN_0200C978(u32 *param0, struct UnkStruct_0200BB14_2 *param1, NarcId param2, s32 param3, @@ -1211,7 +1211,7 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0, return r5 != NULL ? TRUE : FALSE; } -THUMB_FUNC void FUN_0200C9D8( +void FUN_0200C9D8( u32 *param0, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { struct UnkStruct_02008DEC_sub *r6 = FUN_020094F0(param1[3], param5); @@ -1220,7 +1220,7 @@ THUMB_FUNC void FUN_0200C9D8( FUN_02009BE8(r6); } -THUMB_FUNC void FUN_0200CA0C( +void FUN_0200CA0C( u32 *param0, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { struct UnkStruct_02008DEC_sub *r6 = FUN_020094F0(param1[4], param5); @@ -1229,7 +1229,7 @@ THUMB_FUNC void FUN_0200CA0C( FUN_02009DE0(r6); } -THUMB_FUNC u32 FUN_0200CA40(u32 *param0) +u32 FUN_0200CA40(u32 *param0) { return *param0; } diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c index 83f06d3fe..14f5e56ac 100644 --- a/arm9/src/unk_0200CA44.c +++ b/arm9/src/unk_0200CA44.c @@ -5,27 +5,27 @@ extern BOOL FUN_0201B60C(void *, void (*)(u32, void *), void *, u32); extern void FUN_0201B6A0(s32); -THUMB_FUNC BOOL FUN_0200CA44(void (*r0)(u32, void *), void * r1, u32 r2) +BOOL FUN_0200CA44(void (*r0)(u32, void *), void * r1, u32 r2) { return FUN_0201B60C(gSystem.unk18, r0, r1, r2); } -THUMB_FUNC BOOL FUN_0200CA60(void (*r0)(u32, void *), void * r1, u32 r2) +BOOL FUN_0200CA60(void (*r0)(u32, void *), void * r1, u32 r2) { return FUN_0201B60C(gSystem.unk1C, r0, r1, r2); } -THUMB_FUNC BOOL FUN_0200CA7C(void (*r0)(u32, void *), void * r1, u32 r2) +BOOL FUN_0200CA7C(void (*r0)(u32, void *), void * r1, u32 r2) { return FUN_0201B60C(gSystem.unk24, r0, r1, r2); } -THUMB_FUNC BOOL FUN_0200CA98(void (*r0)(u32, void *), void * r1, u32 r2) +BOOL FUN_0200CA98(void (*r0)(u32, void *), void * r1, u32 r2) { return FUN_0201B60C(gSystem.unk20, r0, r1, r2); } -THUMB_FUNC void FUN_0200CAB4(s32 unk1) //bool? +void FUN_0200CAB4(s32 unk1) //bool? { FUN_0201B6A0(unk1); } diff --git a/arm9/src/unk_020139D8.c b/arm9/src/unk_020139D8.c index 73aaabca0..7c2ac459a 100644 --- a/arm9/src/unk_020139D8.c +++ b/arm9/src/unk_020139D8.c @@ -6,8 +6,6 @@ #include "unk_020139D8.h" #include "msgdata/msg.naix" -#pragma thumb on - const u8 sNarcLanguages[][2] = { { LANGUAGE_JAPANESE, 0 }, { LANGUAGE_ENGLISH, 1 }, diff --git a/arm9/src/unk_02015CC0.c b/arm9/src/unk_02015CC0.c index d068fd128..60460b15d 100644 --- a/arm9/src/unk_02015CC0.c +++ b/arm9/src/unk_02015CC0.c @@ -2,8 +2,6 @@ #include "unk_02015CC0.h" #include "constants/map_sections.h" -#pragma thumb on - const u16 UNK_020ED72C[] = { 0, METLOC_DAY_CARE_COUPLE, diff --git a/arm9/src/unk_0201C6B4.c b/arm9/src/unk_0201C6B4.c index 66431d8e8..777456f26 100644 --- a/arm9/src/unk_0201C6B4.c +++ b/arm9/src/unk_0201C6B4.c @@ -1,7 +1,7 @@ #include "global.h" #include "unk_0201C6B4.h" -THUMB_FUNC s32 FUN_0201C6B4(s8 * r0) +s32 FUN_0201C6B4(s8 * r0) { s32 r2 = 0; while(r0[r2] != 0) @@ -11,7 +11,7 @@ THUMB_FUNC s32 FUN_0201C6B4(s8 * r0) return r2; } -THUMB_FUNC s8 * FUN_0201C6C8(s8 * r0, s8 * r1, s8 r2) +s8 * FUN_0201C6C8(s8 * r0, s8 * r1, s8 r2) { for(int r3 = 0; r3 < 0x100; r3++) { @@ -29,7 +29,7 @@ THUMB_FUNC s8 * FUN_0201C6C8(s8 * r0, s8 * r1, s8 r2) return NULL; } -THUMB_FUNC s32 FUN_0201C70C(s8 * r4) +s32 FUN_0201C70C(s8 * r4) { s32 unk0 = FUN_0201C6B4(r4); s32 r3; @@ -60,7 +60,7 @@ THUMB_FUNC s32 FUN_0201C70C(s8 * r4) return r6; } -THUMB_FUNC void FUN_0201C750(s8 * r5, s8 * r4) +void FUN_0201C750(s8 * r5, s8 * r4) { for(u8 r2 = 0; r2 < 4; r2++) { @@ -74,7 +74,7 @@ THUMB_FUNC void FUN_0201C750(s8 * r5, s8 * r4) } } -THUMB_FUNC BOOL FUN_0201C78C(u32 r0) +BOOL FUN_0201C78C(u32 r0) { return r0 < 0x121; } diff --git a/arm9/src/unk_0201CBEC.c b/arm9/src/unk_0201CBEC.c index ea11f2aa8..eebd5a435 100644 --- a/arm9/src/unk_0201CBEC.c +++ b/arm9/src/unk_0201CBEC.c @@ -2,7 +2,7 @@ #include "fx.h" #include "unk_0201CBEC.h" -THUMB_FUNC s32 FUN_0201CBEC(s32 x1, s32 y1, s32 x2, s32 y2) +s32 FUN_0201CBEC(s32 x1, s32 y1, s32 x2, s32 y2) { // Calculate distance between two points with pythagoras s32 x_delta = x1 - x2; diff --git a/arm9/src/unk_02021590.c b/arm9/src/unk_02021590.c index 40dce6580..5ac70cd88 100644 --- a/arm9/src/unk_02021590.c +++ b/arm9/src/unk_02021590.c @@ -20,7 +20,7 @@ static void (*const sDestructors[])(struct FontData *) = { FreeLoadedFontResources_LazyFromNarc, }; -THUMB_FUNC struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, u32 heap_id) +struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BOOL unk3, u32 heap_id) { struct FontData * ret = (struct FontData *)AllocFromHeap(heap_id, sizeof(struct FontData)); if (ret != NULL) @@ -31,14 +31,14 @@ THUMB_FUNC struct FontData *FontData_New(NarcId narcId, s32 fileId, u32 unk2, BO return ret; } -THUMB_FUNC void FontData_Delete(struct FontData * ptr) +void FontData_Delete(struct FontData * ptr) { FreeLoadedFontResources(ptr); FontData_FreeWidthsAndNarc(ptr); FreeToHeap(ptr); } -THUMB_FUNC void FontData_ModeSwitch(struct FontData * ptr, u32 a1, u32 heap_id) +void FontData_ModeSwitch(struct FontData * ptr, u32 a1, u32 heap_id) { if (ptr->glyphAccessMode != a1) { @@ -47,7 +47,7 @@ THUMB_FUNC void FontData_ModeSwitch(struct FontData * ptr, u32 a1, u32 heap_id) } } -THUMB_FUNC void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, u32 heap_id) +void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, BOOL unk, u32 heap_id) { ptr->narc = NARC_New(narcId, heap_id); if (ptr->narc != NULL) @@ -73,7 +73,7 @@ THUMB_FUNC void FontData_Init(struct FontData *ptr, NarcId narcId, s32 fileId, B } } -THUMB_FUNC void FontData_FreeWidthsAndNarc(struct FontData * ptr) +void FontData_FreeWidthsAndNarc(struct FontData * ptr) { if (ptr->glyphWidths != NULL) FreeToHeap(ptr->glyphWidths); @@ -81,13 +81,13 @@ THUMB_FUNC void FontData_FreeWidthsAndNarc(struct FontData * ptr) NARC_Delete(ptr->narc); } -THUMB_FUNC void InitFontResources(struct FontData * ptr, u32 a1, u32 heap_id) +void InitFontResources(struct FontData * ptr, u32 a1, u32 heap_id) { ptr->glyphAccessMode = a1; sAllocators[a1](ptr, heap_id); } -THUMB_FUNC void InitFontResources_FromPreloaded(struct FontData * ptr, u32 heap_id) +void InitFontResources_FromPreloaded(struct FontData * ptr, u32 heap_id) { u32 r4 = ptr->glyphSize * ptr->gfxHeader.numGlyphs; ptr->narcReadBuf = AllocFromHeap(heap_id, r4); @@ -95,29 +95,29 @@ THUMB_FUNC void InitFontResources_FromPreloaded(struct FontData * ptr, u32 heap_ NARC_ReadFromMember(ptr->narc, ptr->fileId, ptr->gfxHeader.headerSize, r4, ptr->narcReadBuf); } -THUMB_FUNC void InitFontResources_LazyFromNarc(struct FontData * ptr, u32 heap_id) +void InitFontResources_LazyFromNarc(struct FontData * ptr, u32 heap_id) { #pragma unused(heap_id) ptr->uncompGlyphFunc = DecompressGlyphTiles_LazyFromNarc; } -THUMB_FUNC void FreeLoadedFontResources(struct FontData * ptr) +void FreeLoadedFontResources(struct FontData * ptr) { sDestructors[ptr->glyphAccessMode](ptr); } -THUMB_FUNC void FreeLoadedFontResources_FromPreloaded(struct FontData * ptr) +void FreeLoadedFontResources_FromPreloaded(struct FontData * ptr) { FreeToHeap(ptr->narcReadBuf); ptr->narcReadBuf = NULL; } -THUMB_FUNC void FreeLoadedFontResources_LazyFromNarc(struct FontData * ptr) +void FreeLoadedFontResources_LazyFromNarc(struct FontData * ptr) { #pragma unused(ptr) } -THUMB_FUNC void TryLoadGlyph(struct FontData * ptr, u32 param1, struct UnkStruct_02002C14_sub * ptr2) +void TryLoadGlyph(struct FontData * ptr, u32 param1, struct UnkStruct_02002C14_sub * ptr2) { if (param1 <= ptr->gfxHeader.numGlyphs) ptr->uncompGlyphFunc(ptr, (u16)(param1 - 1), ptr2); @@ -128,7 +128,7 @@ THUMB_FUNC void TryLoadGlyph(struct FontData * ptr, u32 param1, struct UnkStruct } } -THUMB_FUNC void DecompressGlyphTiles_FromPreloaded(struct FontData * ptr, u16 param1, struct UnkStruct_02002C14_sub * param2) +void DecompressGlyphTiles_FromPreloaded(struct FontData * ptr, u16 param1, struct UnkStruct_02002C14_sub * param2) { u8 *r4 = &((u8 *)ptr->narcReadBuf)[param1 * ptr->glyphSize]; switch (ptr->glyphShape) @@ -155,7 +155,7 @@ THUMB_FUNC void DecompressGlyphTiles_FromPreloaded(struct FontData * ptr, u16 pa param2->height = ptr->gfxHeader.fixedHeight; } -THUMB_FUNC void DecompressGlyphTiles_LazyFromNarc(struct FontData * ptr, u16 param1, struct UnkStruct_02002C14_sub * param2) +void DecompressGlyphTiles_LazyFromNarc(struct FontData * ptr, u16 param1, struct UnkStruct_02002C14_sub * param2) { NARC_ReadFromMember(ptr->narc, ptr->fileId, ptr->gfxHeader.headerSize + param1 * ptr->glyphSize, ptr->glyphSize, ptr->glyphReadBuf); switch (ptr->glyphShape) @@ -182,7 +182,7 @@ THUMB_FUNC void DecompressGlyphTiles_LazyFromNarc(struct FontData * ptr, u16 par param2->height = ptr->gfxHeader.fixedHeight; } -THUMB_FUNC u32 GetStringWidth(struct FontData * ptr, const u16 * str, u32 letterSpacing) +u32 GetStringWidth(struct FontData * ptr, const u16 * str, u32 letterSpacing) { u32 width = 0; @@ -200,18 +200,18 @@ THUMB_FUNC u32 GetStringWidth(struct FontData * ptr, const u16 * str, u32 letter return width - letterSpacing; } -THUMB_FUNC int GetGlyphWidth_VariableWidth(struct FontData * ptr, int a1) +int GetGlyphWidth_VariableWidth(struct FontData * ptr, int a1) { return ptr->glyphWidths[a1]; } -THUMB_FUNC int GetGlyphWidth_FixedWidth(struct FontData * ptr, int a1) +int GetGlyphWidth_FixedWidth(struct FontData * ptr, int a1) { #pragma unused(a1) return ptr->gfxHeader.fixedWidth; } -THUMB_FUNC s32 GetStringWidthMultiline(struct FontData * r7, const u16 * arr, u32 r6) +s32 GetStringWidthMultiline(struct FontData * r7, const u16 * arr, u32 r6) { s32 ret = 0; u32 r4 = 0; @@ -239,7 +239,7 @@ THUMB_FUNC s32 GetStringWidthMultiline(struct FontData * r7, const u16 * arr, u3 return ret; } -THUMB_FUNC s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct FontData * r6, const u16 * arr) +s32 StringGetWidth_SingleLine_HandleClearToControlCode(struct FontData * r6, const u16 * arr) { s32 ret = 0; while (*arr != 0xFFFF) diff --git a/arm9/src/unk_02021934.c b/arm9/src/unk_02021934.c index 9bbcb168f..0faef264a 100644 --- a/arm9/src/unk_02021934.c +++ b/arm9/src/unk_02021934.c @@ -3,8 +3,6 @@ #include "heap.h" #include "string_util.h" -#pragma thumb on - #define ASSERT_STR16(_str) ({ GF_ASSERT(_str != NULL); GF_ASSERT(_str->magic == STR16_MAGIC); }) struct String * String_New(u32 length, u32 heap_id) diff --git a/arm9/src/unk_02021FF8.c b/arm9/src/unk_02021FF8.c index d578bba5d..b0ba0413d 100644 --- a/arm9/src/unk_02021FF8.c +++ b/arm9/src/unk_02021FF8.c @@ -3,8 +3,6 @@ #include "heap.h" #include "unk_02021FF8.h" -#pragma thumb on - struct UnkStruct_020220C4 * FUN_020220C4(u8 * a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, u32 a4) { struct UnkStruct_020220C4 * ret; diff --git a/arm9/src/unk_020222E8.c b/arm9/src/unk_020222E8.c index 45db1f4ed..5baaa3ac7 100644 --- a/arm9/src/unk_020222E8.c +++ b/arm9/src/unk_020222E8.c @@ -2,32 +2,32 @@ #include "unk_020222E8.h" #include "mmap.h" -THUMB_FUNC void * FUN_020222E8() +void * FUN_020222E8() { return (void *)HW_BG_PLTT; } -THUMB_FUNC u32 FUN_020222F0() +u32 FUN_020222F0() { return HW_BG_PLTT_SIZE; } -THUMB_FUNC void * FUN_020222F8() +void * FUN_020222F8() { return (void *)HW_DB_BG_PLTT; } -THUMB_FUNC u32 FUN_02022300() +u32 FUN_02022300() { return HW_DB_BG_PLTT_SIZE; } -THUMB_FUNC void * FUN_02022308() +void * FUN_02022308() { return (void *)HW_OBJ_PLTT; } -THUMB_FUNC void * FUN_02022310() +void * FUN_02022310() { return (void *)HW_DB_OBJ_PLTT; } diff --git a/arm9/src/unk_02022450.c b/arm9/src/unk_02022450.c index 328ddfbd7..118aef8cd 100644 --- a/arm9/src/unk_02022450.c +++ b/arm9/src/unk_02022450.c @@ -26,7 +26,7 @@ static const char arc_name[] = "rom"; #define MAKER_CODE_01_BE '10' /*Replacing (HW_MAIN_MEM_SHARED + 0xC) or (HW_MAIN_MEM_SHARED + 0x10) or defining ADAJ or 01 constants causes match failure*/ -THUMB_FUNC void FUN_02022450() { +void FUN_02022450() { if (!FS_IsAvailable()) { OS_Terminate(); } @@ -51,7 +51,7 @@ THUMB_FUNC void FUN_02022450() { return; } -THUMB_FUNC void Reset_To_File(const char* path) { +void Reset_To_File(const char* path) { FSFile file; FS_InitFile(&file); if (FS_OpenFile(&file, path)) { diff --git a/arm9/src/unk_02022504.c b/arm9/src/unk_02022504.c index 57159029a..30cd57dcd 100644 --- a/arm9/src/unk_02022504.c +++ b/arm9/src/unk_02022504.c @@ -1,32 +1,32 @@ #include "global.h" #include "unk_02022504.h" -THUMB_FUNC void *FUN_02022504(struct SaveBlock2 *sav2) +void *FUN_02022504(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 27); } -THUMB_FUNC struct PCStorage *GetStoragePCPointer(struct SaveBlock2 *sav2) +struct PCStorage *GetStoragePCPointer(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 35); } -THUMB_FUNC struct UnkStruct_0202AC20 * FUN_0202251C(struct SaveBlock2 *sav2) +struct UnkStruct_0202AC20 * FUN_0202251C(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 31); } -THUMB_FUNC void *FUN_02022528(struct SaveBlock2 *sav2) +void *FUN_02022528(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 32); } -THUMB_FUNC u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p) +u8 *LoadHallOfFame(struct SaveBlock2 *sav2, u32 heap_id, int *ret_p) { return ReadSaveFileFromFlash(sav2, heap_id, 0, ret_p); } -THUMB_FUNC s32 SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data) +s32 SaveHallOfFame(struct SaveBlock2 *sav2, u8 *data) { return WriteSaveFileToFlash(sav2, 0, data); } diff --git a/arm9/src/unk_02024E64.c b/arm9/src/unk_02024E64.c index a37b0e7ff..5b85a89d3 100644 --- a/arm9/src/unk_02024E64.c +++ b/arm9/src/unk_02024E64.c @@ -1,14 +1,15 @@ +#include "global.h" #include "unk_02024E64.h" extern void FUN_020250A4(void *param0); extern void FUN_02025484(void *param0); -THUMB_FUNC u32 FUN_02024E64() +u32 FUN_02024E64() { return sizeof(struct UnkStruct_02024E64); } -THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0) +void FUN_02024E6C(struct UnkStruct_02024E64 *param0) { MI_CpuClearFast(param0, sizeof(struct UnkStruct_02024E64)); @@ -20,43 +21,43 @@ THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0) MI_CpuFill16(param0->unk734, EOS, sizeof(param0->unk734) / sizeof(u16)); } -THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2) +struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 0xa); } -THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) +void *FUN_02024EC0(struct SaveBlock2 *sav2) { return FUN_02022634(sav2, 0xa); } -THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024ECC(struct SaveBlock2 *sav2) +struct UnkStruct_02024E64 *FUN_02024ECC(struct SaveBlock2 *sav2) { return SaveArray_Get(sav2, 0xa); } -THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2) +void *FUN_02024ED8(struct SaveBlock2 *sav2) { struct UnkStruct_02024E64 *res = SaveArray_Get(sav2, 0xa); return res->unk700; } -THUMB_FUNC u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk) +u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk) { return unk->rival_name_buf; } -THUMB_FUNC void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str) +void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str) { CopyStringToU16Array(str, unk->rival_name_buf, sizeof(unk->rival_name_buf) / sizeof(u16)); } -THUMB_FUNC u16 *FUN_02024F0C(struct UnkStruct_02024E64 *unk) +u16 *FUN_02024F0C(struct UnkStruct_02024E64 *unk) { return unk->unk734; } -THUMB_FUNC void FUN_02024F18(struct UnkStruct_02024E64 *unk, struct String *str) +void FUN_02024F18(struct UnkStruct_02024E64 *unk, struct String *str) { CopyStringToU16Array(str, unk->unk734, sizeof(unk->unk734) / sizeof(u16)); } diff --git a/arm9/src/unk_02025484.c b/arm9/src/unk_02025484.c index 96da04c90..6f191a9e1 100644 --- a/arm9/src/unk_02025484.c +++ b/arm9/src/unk_02025484.c @@ -3,25 +3,25 @@ #include "error_handling.h" #include "unk_02025484.h" -THUMB_FUNC void FUN_02025484(struct unk_2025484 *r0) +void FUN_02025484(struct unk_2025484 *r0) { MI_CpuFill8(r0, 0, sizeof(struct unk_2025484)); } -THUMB_FUNC u32 *FUN_02025490(struct unk_2025484 *r0, u32 r1) +u32 *FUN_02025490(struct unk_2025484 *r0, u32 r1) { FUN_02025484(r0); r0->unk0 = r1; return &r0->unk4; } -THUMB_FUNC u32 *FUN_020254A0(struct unk_2025484 *r0, u32 r1) +u32 *FUN_020254A0(struct unk_2025484 *r0, u32 r1) { GF_ASSERT(r0->unk0 == r1); return &r0->unk4; } -THUMB_FUNC u32 FUN_020254B4(struct unk_2025484 *r0) +u32 FUN_020254B4(struct unk_2025484 *r0) { return r0->unk0; } diff --git a/arm9/src/unk_020254B8.c b/arm9/src/unk_020254B8.c index 4c12b0b6d..361b82a1a 100644 --- a/arm9/src/unk_020254B8.c +++ b/arm9/src/unk_020254B8.c @@ -4,8 +4,6 @@ #include "heap.h" #include "unk_020254B8.h" -#pragma thumb on - u32 FUN_020254B8(void) { return 16 * sizeof(struct UnkStruct_020254B8); diff --git a/arm9/src/unk_020286F8.c b/arm9/src/unk_020286F8.c index 77b2961ed..6bd5a1a89 100644 --- a/arm9/src/unk_020286F8.c +++ b/arm9/src/unk_020286F8.c @@ -6,8 +6,6 @@ #include "string16.h" #include "unk_020286F8.h" -#pragma thumb on - struct UnkSaveStruct_020286F8 * UNK_021C59D0; u32 FUN_020286F8(void) diff --git a/arm9/src/unk_02029FB0.c b/arm9/src/unk_02029FB0.c index 40854c708..1bfab788d 100644 --- a/arm9/src/unk_02029FB0.c +++ b/arm9/src/unk_02029FB0.c @@ -179,22 +179,22 @@ static inline s32 GetOffsetToUnkB0(s32 a0) return a0 - 44; } -THUMB_FUNC u32 Save_GameStats_sizeof(void) +u32 Save_GameStats_sizeof(void) { return sizeof(struct GameStats); } -THUMB_FUNC void Save_GameStats_Init(struct GameStats * ptr) +void Save_GameStats_Init(struct GameStats * ptr) { MI_CpuClear32(ptr, sizeof(struct GameStats)); } -THUMB_FUNC struct GameStats * Save_GameStats_Get(struct SaveBlock2 * sav2) +struct GameStats * Save_GameStats_Get(struct SaveBlock2 * sav2) { return SaveArray_Get(sav2, 20); } -THUMB_FUNC u32 GameStats_GetValue(struct GameStats * ptr, s32 a1) +u32 GameStats_GetValue(struct GameStats * ptr, s32 a1) { if (a1 < 44) { @@ -211,7 +211,7 @@ THUMB_FUNC u32 GameStats_GetValue(struct GameStats * ptr, s32 a1) } } -THUMB_FUNC u32 GameStats_SetValue(struct GameStats * ptr, s32 a1, u32 a2) +u32 GameStats_SetValue(struct GameStats * ptr, s32 a1, u32 a2) { if (a1 < 44) { @@ -228,7 +228,7 @@ THUMB_FUNC u32 GameStats_SetValue(struct GameStats * ptr, s32 a1, u32 a2) return GameStats_GetValue(ptr, a1); } -THUMB_FUNC u32 GameStats_GetMaxValue(s32 a0) +u32 GameStats_GetMaxValue(s32 a0) { if (a0 < 44) { @@ -251,12 +251,12 @@ THUMB_FUNC u32 GameStats_GetMaxValue(s32 a0) } } -THUMB_FUNC u16 GameStats_GetStdInc(s32 a0) +u16 GameStats_GetStdInc(s32 a0) { return UNK_020EEA7C[a0]; } -THUMB_FUNC u32 GameStats_SetCapped(struct GameStats * ptr, s32 a1, u32 a2) +u32 GameStats_SetCapped(struct GameStats * ptr, s32 a1, u32 a2) { u32 r2 = GameStats_GetMaxValue(a1); if (a2 < r2) @@ -269,7 +269,7 @@ THUMB_FUNC u32 GameStats_SetCapped(struct GameStats * ptr, s32 a1, u32 a2) } } -THUMB_FUNC u32 GameStats_UpdateBounded(struct GameStats * ptr, s32 a1, u32 a2) +u32 GameStats_UpdateBounded(struct GameStats * ptr, s32 a1, u32 a2) { u32 r4 = GameStats_GetMaxValue(a1); u32 r0 = GameStats_GetValue(ptr, a1); @@ -291,7 +291,7 @@ THUMB_FUNC u32 GameStats_UpdateBounded(struct GameStats * ptr, s32 a1, u32 a2) } } -THUMB_FUNC u32 GameStats_Inc(struct GameStats * ptr, s32 a1) +u32 GameStats_Inc(struct GameStats * ptr, s32 a1) { u32 r4 = GameStats_GetMaxValue(a1); u32 r2 = GameStats_GetValue(ptr, a1) + 1; @@ -305,7 +305,7 @@ THUMB_FUNC u32 GameStats_Inc(struct GameStats * ptr, s32 a1) } } -THUMB_FUNC u32 GameStats_Add(struct GameStats * ptr, s32 a1, u32 a2) +u32 GameStats_Add(struct GameStats * ptr, s32 a1, u32 a2) { u32 r6 = GameStats_GetMaxValue(a1); u32 r2 = GameStats_GetValue(ptr, a1); @@ -320,7 +320,7 @@ THUMB_FUNC u32 GameStats_Add(struct GameStats * ptr, s32 a1, u32 a2) } } -THUMB_FUNC u32 GameStats_GetCapped(struct GameStats * ptr, s32 a1) +u32 GameStats_GetCapped(struct GameStats * ptr, s32 a1) { u32 r4 = GameStats_GetMaxValue(a1); u32 r0 = GameStats_GetValue(ptr, a1); @@ -329,7 +329,7 @@ THUMB_FUNC u32 GameStats_GetCapped(struct GameStats * ptr, s32 a1) return r4; } -THUMB_FUNC u32 GameStats_AddSpecial(struct GameStats * ptr, s32 a1) +u32 GameStats_AddSpecial(struct GameStats * ptr, s32 a1) { GF_ASSERT(a1 < 38); u32 r0 = GameStats_GetCapped(ptr, 0) + GameStats_GetStdInc(a1); @@ -343,12 +343,12 @@ THUMB_FUNC u32 GameStats_AddSpecial(struct GameStats * ptr, s32 a1) } } -THUMB_FUNC u32 GameStats_GetStat0(struct GameStats * ptr) +u32 GameStats_GetStat0(struct GameStats * ptr) { return GameStats_GetCapped(ptr, 0); } -THUMB_FUNC void GameStats_IncSpeciesCaught(struct GameStats * ptr, struct Pokedex * pokedex, u16 species) +void GameStats_IncSpeciesCaught(struct GameStats * ptr, struct Pokedex * pokedex, u16 species) { if (!Pokedex_CheckMonCaughtFlag(pokedex, species)) { diff --git a/arm9/src/unk_0202A1E0.c b/arm9/src/unk_0202A1E0.c index fc2c3bd4e..4bee3f317 100644 --- a/arm9/src/unk_0202A1E0.c +++ b/arm9/src/unk_0202A1E0.c @@ -4,23 +4,23 @@ #include "heap.h" #include "unk_0202A1E0.h" -THUMB_FUNC s32 SaveStruct23_Substruct4_Substruct1_sizeof() +s32 SaveStruct23_Substruct4_Substruct1_sizeof() { return sizeof(struct SaveStruct23_Substruct4_Substruct1); // 228 } -THUMB_FUNC void SaveStruct23_Substruct1_Init(struct SaveStruct23_Substruct1 *substruct1) +void SaveStruct23_Substruct1_Init(struct SaveStruct23_Substruct1 *substruct1) { MI_CpuFill8(substruct1, 0, sizeof(struct SaveStruct23_Substruct1)); } -THUMB_FUNC void SaveStruct23_Substruct2_Init(struct SaveStruct23_Substruct2 *substruct2) +void SaveStruct23_Substruct2_Init(struct SaveStruct23_Substruct2 *substruct2) { MI_CpuFill8(substruct2, 0, sizeof(struct SaveStruct23_Substruct2)); substruct2->u_3 = 1; } -THUMB_FUNC void SaveStruct23_Messages_Init(struct SaveStruct23_Messages *messages) +void SaveStruct23_Messages_Init(struct SaveStruct23_Messages *messages) { MailMsg_Init_FromTemplate(&messages->messages[0], 0); MailMsg_Init_FromTemplate(&messages->messages[1], 1); @@ -28,12 +28,12 @@ THUMB_FUNC void SaveStruct23_Messages_Init(struct SaveStruct23_Messages *message MailMsg_Init_FromTemplate(&messages->messages[3], 3); } -THUMB_FUNC void SaveStruct23_Substruct4_Init(struct SaveStruct23_Substruct4 *substruct4) +void SaveStruct23_Substruct4_Init(struct SaveStruct23_Substruct4 *substruct4) { MI_CpuFill8(substruct4, 0, sizeof(struct SaveStruct23_Substruct4)); } -THUMB_FUNC u32 SaveStruct23_Substruct1_GetField(struct SaveStruct23_Substruct1 *substruct1, SaveStruct23_Substruct1_Field field, void *dst) +u32 SaveStruct23_Substruct1_GetField(struct SaveStruct23_Substruct1 *substruct1, SaveStruct23_Substruct1_Field field, void *dst) { switch (field) { @@ -67,7 +67,7 @@ THUMB_FUNC u32 SaveStruct23_Substruct1_GetField(struct SaveStruct23_Substruct1 * }; } -THUMB_FUNC void SaveStruct23_Substruct1_SetField(struct SaveStruct23_Substruct1 *substruct1, SaveStruct23_Substruct1_Field field, void *value) +void SaveStruct23_Substruct1_SetField(struct SaveStruct23_Substruct1 *substruct1, SaveStruct23_Substruct1_Field field, void *value) { switch (field) { @@ -107,7 +107,7 @@ THUMB_FUNC void SaveStruct23_Substruct1_SetField(struct SaveStruct23_Substruct1 } } -THUMB_FUNC void FUN_0202A36C(struct SaveStruct23_Substruct1 *substruct1, s32 arg1, s32 arg2, s32 arg3) +void FUN_0202A36C(struct SaveStruct23_Substruct1 *substruct1, s32 arg1, s32 arg2, s32 arg3) { if (substruct1->u_3 + arg1 < 0xff) { @@ -125,17 +125,17 @@ THUMB_FUNC void FUN_0202A36C(struct SaveStruct23_Substruct1 *substruct1, s32 arg } } -THUMB_FUNC BOOL SaveStruct23_Substruct1_GetFlag1(struct SaveStruct23_Substruct1 *substruct1) +BOOL SaveStruct23_Substruct1_GetFlag1(struct SaveStruct23_Substruct1 *substruct1) { return substruct1->flag1; } -THUMB_FUNC void SaveStruct23_Substruct1_SetFlag1(struct SaveStruct23_Substruct1 *substruct1, BOOL flag) +void SaveStruct23_Substruct1_SetFlag1(struct SaveStruct23_Substruct1 *substruct1, BOOL flag) { substruct1->flag1 = flag; } -THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0x0(struct SaveStruct23_Substruct2 *substruct2, u16 value, DataSetMode mode) +u16 SaveStruct23_Substruct2_SetField_0x0(struct SaveStruct23_Substruct2 *substruct2, u16 value, DataSetMode mode) { switch (mode) { @@ -176,7 +176,7 @@ THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0x0(struct SaveStruct23_Substruc return substruct2->u_0; } -THUMB_FUNC u8 SaveStruct23_Substruct2_SetField_0x2(struct SaveStruct23_Substruct2 *substruct2, DataSetMode mode) +u8 SaveStruct23_Substruct2_SetField_0x2(struct SaveStruct23_Substruct2 *substruct2, DataSetMode mode) { switch (mode) { @@ -199,7 +199,7 @@ THUMB_FUNC u8 SaveStruct23_Substruct2_SetField_0x2(struct SaveStruct23_Substruct return substruct2->u_2; } -THUMB_FUNC u8 SaveStruct23_Substruct2_SetField_0x3(struct SaveStruct23_Substruct2 *substruct2, DataSetMode mode) +u8 SaveStruct23_Substruct2_SetField_0x3(struct SaveStruct23_Substruct2 *substruct2, DataSetMode mode) { switch (mode) { @@ -222,7 +222,7 @@ THUMB_FUNC u8 SaveStruct23_Substruct2_SetField_0x3(struct SaveStruct23_Substruct return substruct2->u_3; } -THUMB_FUNC void SaveStruct23_Substruct2_SetArray(struct SaveStruct23_Substruct2 *substruct2, s32 mode, void *src) +void SaveStruct23_Substruct2_SetArray(struct SaveStruct23_Substruct2 *substruct2, s32 mode, void *src) { if (mode == 0) { @@ -234,7 +234,7 @@ THUMB_FUNC void SaveStruct23_Substruct2_SetArray(struct SaveStruct23_Substruct2 } } -THUMB_FUNC void SaveStruct23_Substruct2_GetArray(struct SaveStruct23_Substruct2 *substruct2, s32 mode, void *dst) +void SaveStruct23_Substruct2_GetArray(struct SaveStruct23_Substruct2 *substruct2, s32 mode, void *dst) { if (mode == 0) { @@ -246,7 +246,7 @@ THUMB_FUNC void SaveStruct23_Substruct2_GetArray(struct SaveStruct23_Substruct2 } } -THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0x16(struct SaveStruct23_Substruct2 *substruct2, struct Unk0202A4B8 *arg1) +u16 SaveStruct23_Substruct2_SetField_0x16(struct SaveStruct23_Substruct2 *substruct2, struct Unk0202A4B8 *arg1) { u16 var1, var2, var3, var4, var5, total; @@ -277,17 +277,17 @@ THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0x16(struct SaveStruct23_Substru return total; } -THUMB_FUNC u16 SaveStruct23_Substruct2_GetField_0x16(struct SaveStruct23_Substruct2 *substruct2) +u16 SaveStruct23_Substruct2_GetField_0x16(struct SaveStruct23_Substruct2 *substruct2) { return substruct2->u_16; } -THUMB_FUNC u8 FUN_0202A524(struct SaveStruct23_Substruct2 *substruct2) +u8 FUN_0202A524(struct SaveStruct23_Substruct2 *substruct2) { return (u8)(substruct2->u_16 / 1000); } -THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0xC(struct SaveStruct23_Substruct2 *substruct2, u16 arg1, DataSetMode mode) +u16 SaveStruct23_Substruct2_SetField_0xC(struct SaveStruct23_Substruct2 *substruct2, u16 arg1, DataSetMode mode) { if (arg1 == 5) { @@ -307,7 +307,7 @@ THUMB_FUNC u16 SaveStruct23_Substruct2_SetField_0xC(struct SaveStruct23_Substruc return substruct2->u_C[arg1]; } -THUMB_FUNC BOOL SaveStruct23_Substruct2_SetFlag(struct SaveStruct23_Substruct2 *substruct2, u16 flagNumber, DataSetMode mode) +BOOL SaveStruct23_Substruct2_SetFlag(struct SaveStruct23_Substruct2 *substruct2, u16 flagNumber, DataSetMode mode) { u16 i; u16 flag = 1; @@ -334,30 +334,30 @@ THUMB_FUNC BOOL SaveStruct23_Substruct2_SetFlag(struct SaveStruct23_Substruct2 * } -THUMB_FUNC void SaveStruct23_Substruct2_SetField_0x4(struct SaveStruct23_Substruct2 *substruct2, u32 value) +void SaveStruct23_Substruct2_SetField_0x4(struct SaveStruct23_Substruct2 *substruct2, u32 value) { substruct2->u_4 = value; } -THUMB_FUNC u32 SaveStruct23_Substruct2_GetField_0x4(struct SaveStruct23_Substruct2 *substruct2) +u32 SaveStruct23_Substruct2_GetField_0x4(struct SaveStruct23_Substruct2 *substruct2) { return substruct2->u_4; } -THUMB_FUNC void SaveStruct23_SetMessage(struct SaveBlock2 *sav2, u32 index, struct MailMessage *message) +void SaveStruct23_SetMessage(struct SaveBlock2 *sav2, u32 index, struct MailMessage *message) { struct SaveStruct23 *data = SaveArray_Get(sav2, 23); MailMsg_Copy(&data->messages.messages[index], message); } -THUMB_FUNC struct MailMessage *SaveStruct23_GetMessage(struct SaveBlock2 *sav2, u32 index) +struct MailMessage *SaveStruct23_GetMessage(struct SaveBlock2 *sav2, u32 index) { struct SaveStruct23 *data = SaveArray_Get(sav2, 23); return &data->messages.messages[index]; } -THUMB_FUNC void SaveStruct23_Substruct4_SetArrayFlag(struct SaveStruct23_Substruct4 *substruct4, u8 arg1, u8 arg2, struct Unk0202A68C *arg3) { +void SaveStruct23_Substruct4_SetArrayFlag(struct SaveStruct23_Substruct4 *substruct4, u8 arg1, u8 arg2, struct Unk0202A68C *arg3) { u8 flag = 1; @@ -380,14 +380,14 @@ THUMB_FUNC void SaveStruct23_Substruct4_SetArrayFlag(struct SaveStruct23_Substru substruct4->u_0 = (arg3->u_0 << 24) | ((arg3->u_4 & 0xff) << 16) | ((arg3->u_8 & 0xff) << 8) | arg3->u_C; } -THUMB_FUNC void SaveStruct23_Substruct4_ClearArrayFlags(struct SaveStruct23_Substruct4 *substruct4) +void SaveStruct23_Substruct4_ClearArrayFlags(struct SaveStruct23_Substruct4 *substruct4) { MI_CpuFill8(substruct4->flags, 0, 250); MI_CpuFill8(&substruct4->u_0, 0, 4); } -THUMB_FUNC BOOL StructUnk0202A68C_Compare(struct Unk0202A68C *struct1, struct Unk0202A68C *struct2) +BOOL StructUnk0202A68C_Compare(struct Unk0202A68C *struct1, struct Unk0202A68C *struct2) { if (struct1->u_0 > struct2->u_0) { return TRUE; @@ -399,7 +399,7 @@ THUMB_FUNC BOOL StructUnk0202A68C_Compare(struct Unk0202A68C *struct1, struct Un return FALSE; } -THUMB_FUNC BOOL SaveStruct23_Substruct4_GetArrayFlag(struct SaveStruct23_Substruct4 *substruct4, u8 arg1, u8 arg2, struct Unk0202A68C *arg3) +BOOL SaveStruct23_Substruct4_GetArrayFlag(struct SaveStruct23_Substruct4 *substruct4, u8 arg1, u8 arg2, struct Unk0202A68C *arg3) { u8 flag = 1; @@ -435,17 +435,17 @@ THUMB_FUNC BOOL SaveStruct23_Substruct4_GetArrayFlag(struct SaveStruct23_Substru } -THUMB_FUNC u8 SaveStruct23_Substruct4_GetField_0xFE(struct SaveStruct23_Substruct4 *substruct4) +u8 SaveStruct23_Substruct4_GetField_0xFE(struct SaveStruct23_Substruct4 *substruct4) { return substruct4->u_FE; } -THUMB_FUNC u8 SaveStruct23_Substruct4_GetField_0xFF(struct SaveStruct23_Substruct4 *substruct4) +u8 SaveStruct23_Substruct4_GetField_0xFF(struct SaveStruct23_Substruct4 *substruct4) { return substruct4->u_FF; } -THUMB_FUNC void SaveStruct23_Substruct4_SetSubstruct1(struct SaveStruct23_Substruct4 *substruct4, struct SaveStruct23_Substruct4_Substruct1 *substruct1, u8 arg2, u8 arg3) +void SaveStruct23_Substruct4_SetSubstruct1(struct SaveStruct23_Substruct4 *substruct4, struct SaveStruct23_Substruct4_Substruct1 *substruct1, u8 arg2, u8 arg3) { MI_CpuCopy8(substruct1, &substruct4->substruct1, sizeof(struct SaveStruct23_Substruct4_Substruct1)*7); substruct4->u_101 = arg2; @@ -453,13 +453,13 @@ THUMB_FUNC void SaveStruct23_Substruct4_SetSubstruct1(struct SaveStruct23_Substr substruct4->u_FE = 1; } -THUMB_FUNC void FUN_0202A784(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 *dst) +void FUN_0202A784(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 *dst) { dst->u_0 = substruct4->u_101; dst->u_1 = substruct4->u_100; } -THUMB_FUNC void FUN_0202A798(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A798 *arg1, u32 arg2) +void FUN_0202A798(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A798 *arg1, u32 arg2) { struct Unk0202A798_substruct *unk_substruct = &arg1->u_0; u8 *var1 = arg1->u_30; @@ -486,7 +486,7 @@ THUMB_FUNC void FUN_0202A798(struct SaveStruct23_Substruct4 *substruct4, struct MI_CpuCopy8(substruct4_substruct1->u_0, var1, 168); } -THUMB_FUNC void FUN_0202A838(struct SaveStruct23_Substruct4 *substruct4, struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2, u8 arg2, u8 arg3) +void FUN_0202A838(struct SaveStruct23_Substruct4 *substruct4, struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2, u8 arg2, u8 arg3) { MI_CpuCopy8(substruct4_substruct2, &substruct4->substruct2, sizeof(struct SaveStruct23_Substruct4_Substruct2)); substruct4->u_103 = arg2; @@ -494,25 +494,25 @@ THUMB_FUNC void FUN_0202A838(struct SaveStruct23_Substruct4 *substruct4, struct substruct4->u_FF = 1; } -THUMB_FUNC void FUN_0202A864(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 *dst) +void FUN_0202A864(struct SaveStruct23_Substruct4 *substruct4, struct Unk0202A784 *dst) { dst->u_0 = substruct4->u_103; dst->u_1 = substruct4->u_102; } -THUMB_FUNC struct SaveStruct23_Substruct4_Substruct2 *FUN_0202A878(struct SaveStruct23_Substruct4 *substruct4, u32 heap_id) +struct SaveStruct23_Substruct4_Substruct2 *FUN_0202A878(struct SaveStruct23_Substruct4 *substruct4, u32 heap_id) { struct SaveStruct23_Substruct4_Substruct2 *substruct4_substruct2 = AllocFromHeap(heap_id, sizeof(struct SaveStruct23_Substruct4_Substruct2) /* 1020 */); MI_CpuCopy8(&substruct4->substruct2, substruct4_substruct2, sizeof(struct SaveStruct23_Substruct4_Substruct2)); return substruct4_substruct2; } -THUMB_FUNC s32 SaveStruct23_sizeof() +s32 SaveStruct23_sizeof() { return sizeof(struct SaveStruct23); // 0xD00 (3328) } -THUMB_FUNC void SaveStruct23_Init(struct SaveStruct23 *saveStruct23) +void SaveStruct23_Init(struct SaveStruct23 *saveStruct23) { SaveStruct23_Substruct1_Init(&saveStruct23->substruct1); SaveStruct23_Substruct2_Init(&saveStruct23->substruct2); @@ -520,17 +520,17 @@ THUMB_FUNC void SaveStruct23_Init(struct SaveStruct23 *saveStruct23) SaveStruct23_Substruct4_Init(&saveStruct23->substruct4); } -THUMB_FUNC struct SaveStruct23_Substruct1 *SaveStruct23_GetSubstruct1(struct SaveBlock2* sav2) +struct SaveStruct23_Substruct1 *SaveStruct23_GetSubstruct1(struct SaveBlock2* sav2) { return &((struct SaveStruct23 *)SaveArray_Get(sav2, 23))->substruct1; } -THUMB_FUNC struct SaveStruct23_Substruct2 *SaveStruct23_GetSubstruct2(struct SaveBlock2* sav2) +struct SaveStruct23_Substruct2 *SaveStruct23_GetSubstruct2(struct SaveBlock2* sav2) { return &((struct SaveStruct23 *)SaveArray_Get(sav2, 23))->substruct2; } -THUMB_FUNC struct SaveStruct23_Substruct4 *SaveStruct23_GetSubstruct4(struct SaveBlock2* sav2) +struct SaveStruct23_Substruct4 *SaveStruct23_GetSubstruct4(struct SaveBlock2* sav2) { return &((struct SaveStruct23 *)SaveArray_Get(sav2, 23))->substruct4; } \ No newline at end of file diff --git a/arm9/src/unk_0202A8F4.c b/arm9/src/unk_0202A8F4.c index 52f18b800..03fc375d8 100644 --- a/arm9/src/unk_0202A8F4.c +++ b/arm9/src/unk_0202A8F4.c @@ -2,12 +2,12 @@ #include "save_block_2.h" #include "unk_0202A8F4.h" -THUMB_FUNC u32 FUN_0202A8F4() +u32 FUN_0202A8F4() { return sizeof(struct Unk0202A8F4); } -THUMB_FUNC void FUN_0202A8F8(struct Unk0202A8F4 *unk) +void FUN_0202A8F8(struct Unk0202A8F4 *unk) { unk->u_0 = 0; unk->u_1 = 0; @@ -25,7 +25,7 @@ THUMB_FUNC void FUN_0202A8F8(struct Unk0202A8F4 *unk) unk->u_D = 0; } -THUMB_FUNC void *FUN_0202A918(struct SaveBlock2* sav2) +void *FUN_0202A918(struct SaveBlock2* sav2) { return SaveArray_Get(sav2, 24); } diff --git a/arm9/src/unk_0202ABBC.c b/arm9/src/unk_0202ABBC.c index 6d27ce88c..be9d1f79d 100644 --- a/arm9/src/unk_0202ABBC.c +++ b/arm9/src/unk_0202ABBC.c @@ -3,52 +3,52 @@ #include "MI_memory.h" #include "unk_0202ABBC.h" -THUMB_FUNC void *FUN_0202ABBC(struct SaveBlock2* sav2) +void *FUN_0202ABBC(struct SaveBlock2* sav2) { return SaveArray_Get(sav2, 26); } -THUMB_FUNC u32 FUN_0202ABC8() +u32 FUN_0202ABC8() { return sizeof(struct Unk0202ABBC); // 0xF4 } -THUMB_FUNC void FUN_0202ABCC(struct Unk0202ABBC* unk) +void FUN_0202ABCC(struct Unk0202ABBC* unk) { MI_CpuClearFast(unk, sizeof(struct Unk0202ABBC)); } -THUMB_FUNC u16 FUN_0202ABDC(struct Unk0202ABBC* unk) +u16 FUN_0202ABDC(struct Unk0202ABBC* unk) { return unk->unk_EC; } -THUMB_FUNC void FUN_0202ABE4(struct Unk0202ABBC* unk, u16 data) +void FUN_0202ABE4(struct Unk0202ABBC* unk, u16 data) { unk->unk_EC = data; } -THUMB_FUNC void FUN_0202ABEC(void *srcp, void *destp) +void FUN_0202ABEC(void *srcp, void *destp) { MI_CpuCopyFast(srcp, destp, 0xec); } -THUMB_FUNC void FUN_0202ABF8(void *destp, void *srcp) +void FUN_0202ABF8(void *destp, void *srcp) { MI_CpuCopyFast(srcp, destp, 0xec); } -THUMB_FUNC u32 FUN_0202AC08(struct Unk0202ABBC* unk) +u32 FUN_0202AC08(struct Unk0202ABBC* unk) { return unk->unk_F0; } -THUMB_FUNC void FUN_0202AC10(struct Unk0202ABBC* unk, u32 data) +void FUN_0202AC10(struct Unk0202ABBC* unk, u32 data) { unk->unk_F0 = data; } -THUMB_FUNC u16 FUN_0202AC18(struct Unk0202ABBC* unk) +u16 FUN_0202AC18(struct Unk0202ABBC* unk) { return unk->unk_EE; } diff --git a/arm9/src/unk_0202C0E0.c b/arm9/src/unk_0202C0E0.c index e78039eca..d5919fa59 100644 --- a/arm9/src/unk_0202C0E0.c +++ b/arm9/src/unk_0202C0E0.c @@ -2,12 +2,12 @@ #include "save_block_2.h" #include "unk_0202C0E0.h" -THUMB_FUNC u32 FUN_0202C0E0() +u32 FUN_0202C0E0() { return sizeof(struct UnkSaveStruct0202C0E4); // 0x28 } -THUMB_FUNC void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct) +void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct) { s32 j, i; @@ -20,7 +20,7 @@ THUMB_FUNC void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct) } } -THUMB_FUNC void FUN_0202C108(struct SaveBlock2 *sav2, u32 a1, u32 a2) +void FUN_0202C108(struct SaveBlock2 *sav2, u32 a1, u32 a2) { struct UnkSaveStruct0202C0E4 *unkSavStruct = SaveArray_Get(sav2, 33); if (unkSavStruct->data[a1][a2] < 9999) @@ -29,7 +29,7 @@ THUMB_FUNC void FUN_0202C108(struct SaveBlock2 *sav2, u32 a1, u32 a2) } } -THUMB_FUNC u16 FUN_0202C12C(struct SaveBlock2 *sav2, u32 a1, u32 a2) +u16 FUN_0202C12C(struct SaveBlock2 *sav2, u32 a1, u32 a2) { struct UnkSaveStruct0202C0E4 *unkSavStruct = SaveArray_Get(sav2, 33); return unkSavStruct->data[a1][a2]; diff --git a/arm9/src/unk_0202C144.c b/arm9/src/unk_0202C144.c index 01a00d903..1bdccaabf 100644 --- a/arm9/src/unk_0202C144.c +++ b/arm9/src/unk_0202C144.c @@ -4,8 +4,6 @@ #include "unk_02029FB0.h" #include "unk_0202C144.h" -#pragma thumb on - void FUN_0202C144(struct SaveBlock2 * sav2, struct Pokemon * mon) { u32 is_egg = GetMonData(mon, MON_DATA_IS_EGG, NULL); diff --git a/arm9/src/unk_0202D858.c b/arm9/src/unk_0202D858.c index 45c7c7763..5d4d81997 100644 --- a/arm9/src/unk_0202D858.c +++ b/arm9/src/unk_0202D858.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_0202D858.h" struct UnkStruct_0202D858 @@ -63,7 +64,7 @@ static const struct UnkStruct_0202D858 UNK_020EEB1E = { { 0x00, } }; -THUMB_FUNC u8 FUN_0202D858(u16 param0) +u8 FUN_0202D858(u16 param0) { struct UnkStruct_0202D858 st0 = UNK_020EEB04; @@ -72,7 +73,7 @@ THUMB_FUNC u8 FUN_0202D858(u16 param0) return st0.unk00[param0]; } -THUMB_FUNC u8 FUN_0202D884(u16 param0) +u8 FUN_0202D884(u16 param0) { struct UnkStruct_0202D858 st0 = UNK_020EEB1E; @@ -81,7 +82,7 @@ THUMB_FUNC u8 FUN_0202D884(u16 param0) return st0.unk00[param0]; } -THUMB_FUNC u32 FUN_0202D8B0(int param0) +u32 FUN_0202D8B0(int param0) { switch (param0) { diff --git a/arm9/src/unk_0202E29C.c b/arm9/src/unk_0202E29C.c index 4a04f39f4..9acf0eadb 100644 --- a/arm9/src/unk_0202E29C.c +++ b/arm9/src/unk_0202E29C.c @@ -54,7 +54,7 @@ extern u32 FUN_0202CB8C(); extern u16 WM_GetDispersionBeaconPeriod(); extern BOOL FUN_0202D2D0(); -THUMB_FUNC void FUN_0202E29C(struct PlayerData *player_data) +void FUN_0202E29C(struct PlayerData *player_data) { if (UNK_021C59F0 == NULL) { @@ -75,7 +75,7 @@ THUMB_FUNC void FUN_0202E29C(struct PlayerData *player_data) } } -THUMB_FUNC BOOL FUN_0202E344() +BOOL FUN_0202E344() { if (UNK_021C59F0 != NULL) { @@ -85,7 +85,7 @@ THUMB_FUNC BOOL FUN_0202E344() return FALSE; } -THUMB_FUNC BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2) +BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2) { int i = 0; while (i < param2) @@ -103,7 +103,7 @@ THUMB_FUNC BOOL FUN_0202E358(u8 *param0, u8 *param1, s32 param2) return TRUE; } -THUMB_FUNC void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1) +void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1) { #pragma unused(param1) s32 r5 = FUN_02033534(); @@ -172,7 +172,7 @@ THUMB_FUNC void FUN_0202E380(struct UnkStruct_0202E29C_sub *param0, u32 param1) } } -THUMB_FUNC void FUN_0202E470(u32 param0, u32 param1) +void FUN_0202E470(u32 param0, u32 param1) { #pragma unused(param0) if (param1 != 0) @@ -183,13 +183,13 @@ THUMB_FUNC void FUN_0202E470(u32 param0, u32 param1) UNK_021C59EC = 2; } -THUMB_FUNC void FUN_0202E488() +void FUN_0202E488() { UNK_021C59EC = 0; FUN_02016454(4); } -THUMB_FUNC void FUN_0202E49C() +void FUN_0202E49C() { FUN_02016444(4); UNK_021C59EC = 1; @@ -199,7 +199,7 @@ THUMB_FUNC void FUN_0202E49C() } } -THUMB_FUNC BOOL FUN_0202E4C8() +BOOL FUN_0202E4C8() { if (UNK_021C59EC == 2) { @@ -209,7 +209,7 @@ THUMB_FUNC BOOL FUN_0202E4C8() return FALSE; } -THUMB_FUNC BOOL FUN_0202E4DC() +BOOL FUN_0202E4DC() { if (UNK_021C59EC != 0) { @@ -219,12 +219,12 @@ THUMB_FUNC BOOL FUN_0202E4DC() return FALSE; } -THUMB_FUNC void FUN_0202E4F0() +void FUN_0202E4F0() { FUN_02090CC8(FUN_0202E488, 0); } -THUMB_FUNC void FUN_0202E500() +void FUN_0202E500() { UNK_021C59F0->unkCB0 = 0; FUN_0202CE64(UNK_021C59F0->unkCA4 + (32 - (u32)(UNK_021C59F0->unkCA4) % 32)); @@ -232,7 +232,7 @@ THUMB_FUNC void FUN_0202E500() FUN_0202CB70(UNK_021C59F0->unkCC0); } -THUMB_FUNC void FUN_0202E538() +void FUN_0202E538() { for (int i = 0; i < 0x10; i++) { @@ -242,12 +242,12 @@ THUMB_FUNC void FUN_0202E538() MI_CpuFill8(UNK_021C59F0->unk054, 0, 0xC00); } -THUMB_FUNC void FUN_0202E56C(u32 param0) +void FUN_0202E56C(u32 param0) { UNK_021C59F0->unkDAD_3 = (u8)param0; } -THUMB_FUNC void FUN_0202E594() +void FUN_0202E594() { UNK_021C59F0->unkCB4 = 0; @@ -264,7 +264,7 @@ THUMB_FUNC void FUN_0202E594() UNK_021C59F0->unkDAB = 0; } -THUMB_FUNC BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2) +BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2) { #pragma unused(param0) FUN_0202E594(); @@ -286,7 +286,7 @@ THUMB_FUNC BOOL FUN_0202E5F8(u32 param0, u32 param1, u32 param2) return FALSE; } -THUMB_FUNC u32 FUN_0202E66C(u32 param0, u32 param1) +u32 FUN_0202E66C(u32 param0, u32 param1) { #pragma unused(param0) FUN_0202E594(); @@ -314,7 +314,7 @@ THUMB_FUNC u32 FUN_0202E66C(u32 param0, u32 param1) return 0; } -THUMB_FUNC u32 FUN_0202E6F0() +u32 FUN_0202E6F0() { if (UNK_021C59F0 == NULL) { @@ -359,7 +359,7 @@ THUMB_FUNC u32 FUN_0202E6F0() return 0; } -THUMB_FUNC BOOL FUN_0202E784() +BOOL FUN_0202E784() { if (UNK_021C59F0 != NULL && UNK_021C59F0->unkDAA == 0) { @@ -371,7 +371,7 @@ THUMB_FUNC BOOL FUN_0202E784() return FALSE; } -THUMB_FUNC void FUN_0202E7B0(u32 param0) +void FUN_0202E7B0(u32 param0) { if (UNK_021C59F0 != NULL) { @@ -386,7 +386,7 @@ THUMB_FUNC void FUN_0202E7B0(u32 param0) } } -THUMB_FUNC void FUN_0202E7D8() +void FUN_0202E7D8() { FreeToHeap(UNK_021C59F0->unkCBC); FreeToHeap(UNK_021C59F0->unkCA4); @@ -395,7 +395,7 @@ THUMB_FUNC void FUN_0202E7D8() UNK_021C59F0 = NULL; } -THUMB_FUNC u32 FUN_0202E810() +u32 FUN_0202E810() { if (FUN_02030F40() == 0) { @@ -414,7 +414,7 @@ THUMB_FUNC u32 FUN_0202E810() return count; } -THUMB_FUNC s32 FUN_0202E844(u32 param0) +s32 FUN_0202E844(u32 param0) { int i; u32 count = 0; @@ -437,17 +437,17 @@ THUMB_FUNC s32 FUN_0202E844(u32 param0) return 0; } -THUMB_FUNC u8 FUN_0202E878() +u8 FUN_0202E878() { return UNK_021C59F0->unkCB4; } -THUMB_FUNC void FUN_0202E88C() +void FUN_0202E88C() { UNK_021C59F0->unkCB4 = 0; } -THUMB_FUNC s32 FUN_0202E8A0(s32 param0) +s32 FUN_0202E8A0(s32 param0) { if (UNK_021C59F0->unkC84[param0] != 0) { @@ -464,7 +464,7 @@ THUMB_FUNC s32 FUN_0202E8A0(s32 param0) return 0; } -THUMB_FUNC s32 FUN_0202E8D0(s32 param0) +s32 FUN_0202E8D0(s32 param0) { for (int i = 0xf; i >= 0; i--) { @@ -478,7 +478,7 @@ THUMB_FUNC s32 FUN_0202E8D0(s32 param0) return -1; } -THUMB_FUNC s32 FUN_0202E8F4() +s32 FUN_0202E8F4() { if (FUN_0202E810() == 0) { @@ -500,7 +500,7 @@ THUMB_FUNC s32 FUN_0202E8F4() return -1; } -THUMB_FUNC s32 FUN_0202E950() +s32 FUN_0202E950() { if (FUN_0202E810() == 0) { @@ -525,7 +525,7 @@ THUMB_FUNC s32 FUN_0202E950() return ret; } -THUMB_FUNC void FUN_0202E9AC(u32 param0, struct PlayerData *player_data) +void FUN_0202E9AC(u32 param0, struct PlayerData *player_data) { int i; u32 count = 0; @@ -547,7 +547,7 @@ THUMB_FUNC void FUN_0202E9AC(u32 param0, struct PlayerData *player_data) } } -THUMB_FUNC u32 FUN_0202E9E8(u32 param0) +u32 FUN_0202E9E8(u32 param0) { if (FUN_0202CBD4() == 2) { @@ -574,7 +574,7 @@ THUMB_FUNC u32 FUN_0202E9E8(u32 param0) return 0; } -THUMB_FUNC void FUN_0202EA54() +void FUN_0202EA54() { for (int i = 0; i < 0x10; i++) { @@ -596,7 +596,7 @@ THUMB_FUNC void FUN_0202EA54() } } -THUMB_FUNC void FUN_0202EA9C() +void FUN_0202EA9C() { s32 res = FUN_02033534(); struct PlayerData *player_data = FUN_0202EF70(); @@ -632,7 +632,7 @@ THUMB_FUNC void FUN_0202EA9C() FUN_0202CB7C(&UNK_021C59F0->unkCC4, sizeof(struct UnkStruct_0202E29C_sub2)); } -THUMB_FUNC void FUN_0202EB7C() +void FUN_0202EB7C() { struct UnkStruct_0202E29C_sub2 *r4 = &UNK_021C59F0->unkCC4; if (r4->unk06 != FUN_0202EDB8()) @@ -648,7 +648,7 @@ THUMB_FUNC void FUN_0202EB7C() } } -THUMB_FUNC void FUN_0202EBD0(u16 param0) +void FUN_0202EBD0(u16 param0) { u32 r5 = FUN_0202CBD4(); FUN_0202DF54(); @@ -745,7 +745,7 @@ THUMB_FUNC void FUN_0202EBD0(u16 param0) } } -THUMB_FUNC void FUN_0202ED70(u16 param0) +void FUN_0202ED70(u16 param0) { if (UNK_021C59F0 != NULL) { @@ -753,7 +753,7 @@ THUMB_FUNC void FUN_0202ED70(u16 param0) } } -THUMB_FUNC u32 FUN_0202ED84(u16 param0) +u32 FUN_0202ED84(u16 param0) { if (UNK_021C59F0 == NULL) { @@ -773,7 +773,7 @@ THUMB_FUNC u32 FUN_0202ED84(u16 param0) return 1; } -THUMB_FUNC u32 FUN_0202EDB8() +u32 FUN_0202EDB8() { u32 count = 0; for (int i = 0; i < 8; i++) @@ -787,7 +787,7 @@ THUMB_FUNC u32 FUN_0202EDB8() return count; } -THUMB_FUNC BOOL FUN_0202EDD8() +BOOL FUN_0202EDD8() { if (UNK_021C59F0 != NULL) { @@ -800,7 +800,7 @@ THUMB_FUNC BOOL FUN_0202EDD8() return FALSE; } -THUMB_FUNC BOOL FUN_0202EDF8() +BOOL FUN_0202EDF8() { if (UNK_021C59F0 != NULL) { @@ -810,7 +810,7 @@ THUMB_FUNC BOOL FUN_0202EDF8() return FALSE; } -THUMB_FUNC u32 FUN_0202EE0C() +u32 FUN_0202EE0C() { if (UNK_021C59F0 != NULL) { @@ -820,7 +820,7 @@ THUMB_FUNC u32 FUN_0202EE0C() return 1; } -THUMB_FUNC u32 FUN_0202EE24() +u32 FUN_0202EE24() { if (UNK_021C59F0 != NULL) { @@ -830,7 +830,7 @@ THUMB_FUNC u32 FUN_0202EE24() return 0; } -THUMB_FUNC BOOL FUN_0202EE44() +BOOL FUN_0202EE44() { if (FUN_0202EE60() && FUN_0202CBE8() == 0x14) { @@ -840,7 +840,7 @@ THUMB_FUNC BOOL FUN_0202EE44() return FALSE; } -THUMB_FUNC BOOL FUN_0202EE60() +BOOL FUN_0202EE60() { if (UNK_021C59F0 != NULL && UNK_021C59F0->unkDAD_0) { @@ -850,7 +850,7 @@ THUMB_FUNC BOOL FUN_0202EE60() return FALSE; } -THUMB_FUNC void FUN_0202EE84(u32 param0) +void FUN_0202EE84(u32 param0) { if (UNK_021C59F0 != NULL) { @@ -858,7 +858,7 @@ THUMB_FUNC void FUN_0202EE84(u32 param0) } } -THUMB_FUNC void FUN_0202EEB0(u32 param0) +void FUN_0202EEB0(u32 param0) { if (UNK_021C59F0 != NULL) { @@ -868,7 +868,7 @@ THUMB_FUNC void FUN_0202EEB0(u32 param0) } } -THUMB_FUNC u16 FUN_0202EEE8(u16 param0) +u16 FUN_0202EEE8(u16 param0) { u16 r4 = WM_GetDispersionBeaconPeriod(); GF_ASSERT(param0 < 0x1a); @@ -886,7 +886,7 @@ THUMB_FUNC u16 FUN_0202EEE8(u16 param0) return r4; } -THUMB_FUNC struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0) +struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0) { if (UNK_021C59F0 != NULL) { @@ -899,7 +899,7 @@ THUMB_FUNC struct UnkStruct_0202E29C_sub *FUN_0202EF18(u32 param0) return NULL; } -THUMB_FUNC struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0) +struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0) { if (UNK_021C59F0 != NULL) { @@ -912,12 +912,12 @@ THUMB_FUNC struct UnkStruct_0202E29C_sub4 *FUN_0202EF44(s32 param0) return NULL; } -THUMB_FUNC struct PlayerData *FUN_0202EF70() +struct PlayerData *FUN_0202EF70() { return UNK_021C59F0->unkCB8; } -THUMB_FUNC struct PlayerData *FUN_0202EF84(int param0) +struct PlayerData *FUN_0202EF84(int param0) { if (UNK_021C59F0->unkC84[param0] == 0) { @@ -929,7 +929,7 @@ THUMB_FUNC struct PlayerData *FUN_0202EF84(int param0) return &r0->unk10; } -THUMB_FUNC void FUN_0202EFAC(u8 *param0, s32 param1) +void FUN_0202EFAC(u8 *param0, s32 param1) { if (UNK_021C59F0 != NULL) { @@ -939,7 +939,7 @@ THUMB_FUNC void FUN_0202EFAC(u8 *param0, s32 param1) } } -THUMB_FUNC BOOL FUN_0202EFE4(u8 *param0) +BOOL FUN_0202EFE4(u8 *param0) { for (int i = 0; i < 8; i++) { @@ -952,7 +952,7 @@ THUMB_FUNC BOOL FUN_0202EFE4(u8 *param0) return FALSE; } -THUMB_FUNC u32 FUN_0202F03C() +u32 FUN_0202F03C() { if (UNK_021C59F0 != NULL) { @@ -962,7 +962,7 @@ THUMB_FUNC u32 FUN_0202F03C() return 0; } -THUMB_FUNC void FUN_0202F05C() +void FUN_0202F05C() { if (UNK_021C59F0 != NULL) { @@ -970,17 +970,17 @@ THUMB_FUNC void FUN_0202F05C() } } -THUMB_FUNC void FUN_0202F078(struct MailMessage *mail_message) +void FUN_0202F078(struct MailMessage *mail_message) { MI_CpuCopy8(mail_message, &UNK_021C59F0->unkCA8, sizeof(struct MailMessage)); } -THUMB_FUNC void FUN_0202F094(void *param0) +void FUN_0202F094(void *param0) { MI_CpuCopy8(param0, UNK_021C59F0->unkCBC, FUN_02023AC4()); } -THUMB_FUNC void FUN_0202F0B8() +void FUN_0202F0B8() { FUN_0202EA9C(); FUN_0202D240(&UNK_021C59F0->unkCC4, @@ -989,7 +989,7 @@ THUMB_FUNC void FUN_0202F0B8() UNK_021C59E8); } -THUMB_FUNC u32 FUN_0202F0DC(u8 param0) +u32 FUN_0202F0DC(u8 param0) { int i; u32 r5 = 0; @@ -1005,18 +1005,18 @@ THUMB_FUNC u32 FUN_0202F0DC(u8 param0) return r5; } -THUMB_FUNC BOOL FUN_0202F104() +BOOL FUN_0202F104() { return FUN_0202D2D0(); } -THUMB_FUNC void FUN_0202F10C(struct UnkStruct_0202E29C_sub3 *param0) +void FUN_0202F10C(struct UnkStruct_0202E29C_sub3 *param0) { MI_CpuCopy8(param0, &UNK_021C59F0->unk000, sizeof(struct UnkStruct_0202E29C_sub3)); FUN_0202F0B8(); } -THUMB_FUNC u8 *FUN_0202F124(u32 param0) +u8 *FUN_0202F124(u32 param0) { if (UNK_021C59F0 != NULL && UNK_021C59F0->unkC84[param0] != 0) { diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c index 93be8c22e..c41c2bcbe 100644 --- a/arm9/src/unk_0202F150.c +++ b/arm9/src/unk_0202F150.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_0202F150.h" #include "unk_02031480.h" #include "unk_02031734.h" @@ -43,7 +44,7 @@ extern void GF_RTC_CopyDateTime(RTCDate *, RTCTime *); extern void FUN_0202D830(u8 *param0, u32 param1); extern u32 MOD04_021D8624(); -THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1) +u32 FUN_0202F150(u32 param0, u32 param1) { u32 r4 = 0; UNK_021C59F4 = 0; @@ -118,7 +119,7 @@ THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1) return 1; } -THUMB_FUNC void FUN_0202F2F0() +void FUN_0202F2F0() { UNK_021C59F8->unk62C = 0; UNK_021C59F8->unk62D = 0; @@ -208,7 +209,7 @@ THUMB_FUNC void FUN_0202F2F0() UNK_021C59F8->unk688 = 0; } -THUMB_FUNC void FUN_0202F5A4() +void FUN_0202F5A4() { UNK_021C59F8->unk62C = 0; UNK_021C59F8->unk62D = 0; @@ -289,7 +290,7 @@ THUMB_FUNC void FUN_0202F5A4() UNK_021C59F8->unk688 = 0; } -THUMB_FUNC void FUN_0202F820(int param0) +void FUN_0202F820(int param0) { UNK_021C59F8->unk65F[param0] = 0; @@ -313,7 +314,7 @@ THUMB_FUNC void FUN_0202F820(int param0) UNK_021C59F8->unk58C[param0].unk00 = 0; } -THUMB_FUNC void FUN_0202F8D4() +void FUN_0202F8D4() { for (int i = 1; i < 8; i++) { @@ -324,12 +325,12 @@ THUMB_FUNC void FUN_0202F8D4() } } -THUMB_FUNC void FUN_0202F910(int param0) +void FUN_0202F910(int param0) { FUN_0202F820(param0); } -THUMB_FUNC BOOL FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3) +BOOL FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3) { BOOL ret = TRUE; if (FUN_02033534() < 0x13) @@ -343,7 +344,7 @@ THUMB_FUNC BOOL FUN_0202F918(u32 param0, u32 param1, u32 param2, u32 param3) return ret; } -THUMB_FUNC u32 FUN_0202F950(u32 param0, u32 param1, u32 param2) +u32 FUN_0202F950(u32 param0, u32 param1, u32 param2) { u32 ret = 1; if (FUN_02033534() < 0x13) @@ -358,7 +359,7 @@ THUMB_FUNC u32 FUN_0202F950(u32 param0, u32 param1, u32 param2) return ret; } -THUMB_FUNC void FUN_0202F984() +void FUN_0202F984() { u32 r4 = 0; if (FUN_02031190() == 0) @@ -395,7 +396,7 @@ THUMB_FUNC void FUN_0202F984() FUN_02031088(); } -THUMB_FUNC void FUN_0202F9E0(u32 param0) +void FUN_0202F9E0(u32 param0) { u8 r2 = UNK_021C59F8->unk67D; if (r2 == 0 && param0 == 1) @@ -408,17 +409,17 @@ THUMB_FUNC void FUN_0202F9E0(u32 param0) } } -THUMB_FUNC void FUN_0202FA10() +void FUN_0202FA10() { FUN_0202F9E0(1); } -THUMB_FUNC void FUN_0202FA1C() +void FUN_0202FA1C() { FUN_0202F9E0(0); } -THUMB_FUNC u8 FUN_0202FA28() +u8 FUN_0202FA28() { u8 ret = UNK_021C59F8->unk67D; if (ret == 2) @@ -433,7 +434,7 @@ THUMB_FUNC u8 FUN_0202FA28() return ret; } -THUMB_FUNC u32 FUN_0202FA48() +u32 FUN_0202FA48() { if (FUN_0202FA28() == 1) { @@ -443,7 +444,7 @@ THUMB_FUNC u32 FUN_0202FA48() return 0; } -THUMB_FUNC void FUN_0202FA5C() +void FUN_0202FA5C() { u32 r4 = 0; if (UNK_021C59F8 != 0) @@ -481,12 +482,12 @@ THUMB_FUNC void FUN_0202FA5C() } } -THUMB_FUNC u32 FUN_0202FB18(u32 param0) +u32 FUN_0202FB18(u32 param0) { return FUN_0202E9E8(param0); } -THUMB_FUNC void FUN_0202FB20() +void FUN_0202FB20() { if (UNK_021C59F4 != 0) { @@ -500,7 +501,7 @@ THUMB_FUNC void FUN_0202FB20() } } -THUMB_FUNC void FUN_0202FB58() +void FUN_0202FB58() { if (FUN_0202F03C() != 0) { @@ -518,7 +519,7 @@ THUMB_FUNC void FUN_0202FB58() } } -THUMB_FUNC BOOL FUN_0202FB80() +BOOL FUN_0202FB80() { FUN_02031CDC(); @@ -571,7 +572,7 @@ THUMB_FUNC BOOL FUN_0202FB80() return TRUE; } -THUMB_FUNC void FUN_0202FC60() +void FUN_0202FC60() { u8 r4 = UNK_021C59F4; @@ -585,7 +586,7 @@ THUMB_FUNC void FUN_0202FC60() UNK_021C59F4 = r4; } -THUMB_FUNC void FUN_0202FC80() +void FUN_0202FC80() { u8 r4 = UNK_021C59F4; @@ -600,7 +601,7 @@ THUMB_FUNC void FUN_0202FC80() UNK_021C59F4 = r4; } -THUMB_FUNC void FUN_0202FCA8() +void FUN_0202FCA8() { u8 r4 = UNK_021C59F4; @@ -615,7 +616,7 @@ THUMB_FUNC void FUN_0202FCA8() UNK_021C59F4 = r4; } -THUMB_FUNC void FUN_0202FCCC() +void FUN_0202FCCC() { if (UNK_021C59F8->unk683 != 0) { @@ -720,7 +721,7 @@ THUMB_FUNC void FUN_0202FCCC() } #ifdef NONMATCHING -THUMB_FUNC BOOL FUN_0202FE2C(int param0) +BOOL FUN_0202FE2C(int param0) { // these 3 variables are shuffled on the stack, everything else matches @@ -758,7 +759,7 @@ THUMB_FUNC BOOL FUN_0202FE2C(int param0) return TRUE; } #else -THUMB_FUNC asm BOOL FUN_0202FE2C(int param0) +asm BOOL FUN_0202FE2C(int param0) { // clang-format off push {r3-r7, lr} @@ -855,7 +856,7 @@ _0202FEDE: } #endif -THUMB_FUNC void FUN_0202FEEC() +void FUN_0202FEEC() { if (UNK_021C59F8 == NULL || FUN_02033534() >= 0x13) { @@ -922,7 +923,7 @@ THUMB_FUNC void FUN_0202FEEC() } } -THUMB_FUNC void FUN_02030074() +void FUN_02030074() { if (UNK_021C59F8->unk683 != 0) { @@ -1030,7 +1031,7 @@ THUMB_FUNC void FUN_02030074() } } -THUMB_FUNC void FUN_02030238(u32 param0, u8 *param1, u32 param2) +void FUN_02030238(u32 param0, u8 *param1, u32 param2) { if (UNK_021C59F8->unk66F[0] != 0) { @@ -1042,7 +1043,7 @@ THUMB_FUNC void FUN_02030238(u32 param0, u8 *param1, u32 param2) FUN_0203026C(param0, param1, param2); } -THUMB_FUNC void FUN_0203026C(u32 param0, u8 *param1, u32 param2) +void FUN_0203026C(u32 param0, u8 *param1, u32 param2) { #pragma unused(param0) #pragma unused(param2) @@ -1129,7 +1130,7 @@ THUMB_FUNC void FUN_0203026C(u32 param0, u8 *param1, u32 param2) FUN_0202D3A4(&UNK_021C59F8->unk470, param1 + 4, param1[3], 0x5FF); } -THUMB_FUNC void FUN_020303BC(u32 param0, u8 *param1, u32 param2) +void FUN_020303BC(u32 param0, u8 *param1, u32 param2) { if (UNK_021C59F8->unk66F[param0] != 0) { @@ -1142,7 +1143,7 @@ THUMB_FUNC void FUN_020303BC(u32 param0, u8 *param1, u32 param2) FUN_020303F4(param0, param1, param2); } -THUMB_FUNC void FUN_020303F4(u32 param0, u8 *param1, u32 param2) +void FUN_020303F4(u32 param0, u8 *param1, u32 param2) { #pragma unused(param2) UNK_021C59F8->unk638[param0]--; @@ -1179,7 +1180,7 @@ THUMB_FUNC void FUN_020303F4(u32 param0, u8 *param1, u32 param2) } } -THUMB_FUNC void FUN_020304D4(u32 param0) +void FUN_020304D4(u32 param0) { if (param0 != 0) { @@ -1190,7 +1191,7 @@ THUMB_FUNC void FUN_020304D4(u32 param0) GF_ASSERT(0); } -THUMB_FUNC void FUN_020304F0(u32 param0) +void FUN_020304F0(u32 param0) { if (param0 != 0) { @@ -1201,7 +1202,7 @@ THUMB_FUNC void FUN_020304F0(u32 param0) GF_ASSERT(0); } -THUMB_FUNC void FUN_0203050C() +void FUN_0203050C() { if (UNK_021C59F8 == 0 || FUN_02033534() >= 0x13) { @@ -1270,7 +1271,7 @@ THUMB_FUNC void FUN_0203050C() } #ifdef NONMATCHING -THUMB_FUNC void FUN_02030674() +void FUN_02030674() { u16 r4 = 0; if (UNK_021C59F8->unk62C == 0 || (UNK_021C59F8->unk628 & 0xf0) == 0) @@ -1346,7 +1347,7 @@ THUMB_FUNC void FUN_02030674() UNK_021C59F8->unk628 += r4; } #else -THUMB_FUNC asm void FUN_02030674() +asm void FUN_02030674() { // clang-format off push {r3-r7, lr} @@ -1518,22 +1519,22 @@ _02030794: } #endif -THUMB_FUNC void FUN_020307A8() +void FUN_020307A8() { UNK_021C59F8->unk62C = 1; } -THUMB_FUNC void FUN_020307BC() +void FUN_020307BC() { UNK_021C59F8->unk62C = 2; } -THUMB_FUNC void FUN_020307D0() +void FUN_020307D0() { UNK_021C59F8->unk62C = 0; } -THUMB_FUNC u32 FUN_020307E4(u8 *param0, u32 param1) +u32 FUN_020307E4(u8 *param0, u32 param1) { UNK_021C59F8->unk610[param1] = 0; @@ -1565,11 +1566,11 @@ THUMB_FUNC u32 FUN_020307E4(u8 *param0, u32 param1) return 1; } -THUMB_FUNC void FUN_0203086C() +void FUN_0203086C() { } -THUMB_FUNC u32 FUN_02030870(u8 *param0) +u32 FUN_02030870(u8 *param0) { if (UNK_021C59F8->unk62A != 0) { @@ -1612,7 +1613,7 @@ THUMB_FUNC u32 FUN_02030870(u8 *param0) return 0; } -THUMB_FUNC u32 FUN_02030930(u8 *param0) +u32 FUN_02030930(u8 *param0) { int r5 = FUN_02031228((u16)FUN_02033534()); FUN_0202D858((u16)FUN_02033534()); @@ -1662,7 +1663,7 @@ THUMB_FUNC u32 FUN_02030930(u8 *param0) return 1; } -THUMB_FUNC void FUN_02030A00(u8 *param0) +void FUN_02030A00(u8 *param0) { param0[0] = 0xb; if (UNK_021C59F8->unk685 == 0) @@ -1693,7 +1694,7 @@ THUMB_FUNC void FUN_02030A00(u8 *param0) param0[4] = 0xbb; } -THUMB_FUNC u32 FUN_02030A78(u32 param0, u8 *param1, u32 param2) +u32 FUN_02030A78(u32 param0, u8 *param1, u32 param2) { if (FUN_02030E7C(FUN_02031190()) == 0 && FUN_02031280() == 0) { @@ -1713,7 +1714,7 @@ THUMB_FUNC u32 FUN_02030A78(u32 param0, u8 *param1, u32 param2) return 0; } -THUMB_FUNC u32 FUN_02030ADC(u32 param0, u8 *param1, u32 param2) +u32 FUN_02030ADC(u32 param0, u8 *param1, u32 param2) { if (FUN_02030E7C(FUN_02031190()) == 0 && FUN_02031280() == 0) { @@ -1733,7 +1734,7 @@ THUMB_FUNC u32 FUN_02030ADC(u32 param0, u8 *param1, u32 param2) return 0; } -THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2) +u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2) { if (FUN_02031190() != 0) { @@ -1764,7 +1765,7 @@ THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2) return 0; } -THUMB_FUNC u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2) +u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2) { if (FUN_02031190() != 0) { @@ -1795,17 +1796,17 @@ THUMB_FUNC u32 FUN_02030BC4(u32 param0, u8 *param1, u32 param2) return 0; } -THUMB_FUNC u32 FUN_02030C4C(u32 param0, u8 *param1) +u32 FUN_02030C4C(u32 param0, u8 *param1) { return FUN_02030BC4(param0, param1, 0); } -THUMB_FUNC int FUN_02030C58() +int FUN_02030C58() { return FUN_0202D498(&UNK_021C59F8->unk464); } -THUMB_FUNC void FUN_02030C70( +void FUN_02030C70( u32 param0, u32 param1, u32 param2, void *param3, struct UnkStruct0202F150_sub2 *param4) { FUN_0202D934(param0, param1, param2, param3); @@ -1815,7 +1816,7 @@ THUMB_FUNC void FUN_02030C70( param4->unk00 = 0; } -THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, +void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, u32 param1, void *param2, u32 param3, @@ -1901,7 +1902,7 @@ THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, } } -THUMB_FUNC void FUN_02030DA4() +void FUN_02030DA4() { if (UNK_021C59F8 != NULL) { @@ -1920,7 +1921,7 @@ THUMB_FUNC void FUN_02030DA4() } } -THUMB_FUNC void FUN_02030DFC() +void FUN_02030DFC() { if (UNK_021C59F8 != NULL) { @@ -1945,7 +1946,7 @@ THUMB_FUNC void FUN_02030DFC() } } -THUMB_FUNC BOOL FUN_02030E7C(u16 param0) +BOOL FUN_02030E7C(u16 param0) { if (UNK_021C59F8 == NULL) { @@ -2005,7 +2006,7 @@ THUMB_FUNC BOOL FUN_02030E7C(u16 param0) return FALSE; } -THUMB_FUNC s32 FUN_02030F20() +s32 FUN_02030F20() { s32 r4 = 0; for (int i = 0; i < 8; i++) @@ -2019,7 +2020,7 @@ THUMB_FUNC s32 FUN_02030F20() return r4; } -THUMB_FUNC BOOL FUN_02030F40() +BOOL FUN_02030F40() { if (UNK_021C59F8 != NULL && FUN_02033534() >= 0x13) { @@ -2029,17 +2030,17 @@ THUMB_FUNC BOOL FUN_02030F40() return FUN_0202EDF8(); } -THUMB_FUNC void FUN_02030F60(u8 param0) +void FUN_02030F60(u8 param0) { UNK_021C59F8->unk62B = param0; } -THUMB_FUNC u8 FUN_02030F74(u32 param0) +u8 FUN_02030F74(u32 param0) { return UNK_021C59F8->unk620[param0]; } -THUMB_FUNC u32 FUN_02030F88(u32 param0) +u32 FUN_02030F88(u32 param0) { if (UNK_021C59F8 == NULL) { @@ -2052,7 +2053,7 @@ THUMB_FUNC u32 FUN_02030F88(u32 param0) return ret; } -THUMB_FUNC void FUN_02030FA8() +void FUN_02030FA8() { if (UNK_021C59F8 != NULL) { @@ -2060,7 +2061,7 @@ THUMB_FUNC void FUN_02030FA8() } } -THUMB_FUNC void FUN_02030FC8() +void FUN_02030FC8() { if (UNK_021C59F8 != NULL) { @@ -2068,7 +2069,7 @@ THUMB_FUNC void FUN_02030FC8() } } -THUMB_FUNC u32 FUN_02030FE0() +u32 FUN_02030FE0() { if (UNK_021C59F8 != NULL) { @@ -2078,7 +2079,7 @@ THUMB_FUNC u32 FUN_02030FE0() return 1; } -THUMB_FUNC void FUN_02031000(u32 param0, u8 *param1, u32 param2) +void FUN_02031000(u32 param0, u8 *param1, u32 param2) { if (FUN_0202FA28() == 1) { @@ -2089,12 +2090,12 @@ THUMB_FUNC void FUN_02031000(u32 param0, u8 *param1, u32 param2) FUN_0202D684(UNK_021C59F8->unk56C, param0, param1, param2, 1, 0); } -THUMB_FUNC void FUN_0203105C(u32 param0, u8 *param1, u32 param2) +void FUN_0203105C(u32 param0, u8 *param1, u32 param2) { FUN_0202D684(UNK_021C59F8->unk54C, param0, param1, param2, 0, 0); } -THUMB_FUNC void FUN_02031088() +void FUN_02031088() { if (UNK_021C59F8 != NULL) { @@ -2133,7 +2134,7 @@ THUMB_FUNC void FUN_02031088() } } -THUMB_FUNC void FUN_0203110C(u32 param0, u32 param1, u8 *param2) +void FUN_0203110C(u32 param0, u32 param1, u8 *param2) { #pragma unused(param0) #pragma unused(param1) @@ -2144,7 +2145,7 @@ THUMB_FUNC void FUN_0203110C(u32 param0, u32 param1, u8 *param2) } } -THUMB_FUNC void FUN_02031134(u32 param0, u32 param1, u8 *param2) +void FUN_02031134(u32 param0, u32 param1, u8 *param2) { #pragma unused(param0) #pragma unused(param1) @@ -2155,7 +2156,7 @@ THUMB_FUNC void FUN_02031134(u32 param0, u32 param1, u8 *param2) } } -THUMB_FUNC void FUN_0203115C(u32 param0, u32 param1, u8 *param2) +void FUN_0203115C(u32 param0, u32 param1, u8 *param2) { #pragma unused(param0) #pragma unused(param1) @@ -2166,7 +2167,7 @@ THUMB_FUNC void FUN_0203115C(u32 param0, u32 param1, u8 *param2) } } -THUMB_FUNC u16 FUN_02031190() +u16 FUN_02031190() { if (UNK_021C59F8 != NULL) { @@ -2192,22 +2193,22 @@ THUMB_FUNC u16 FUN_02031190() return 0; } -THUMB_FUNC u32 FUN_020311D0(u32 param0, u8 *param1) +u32 FUN_020311D0(u32 param0, u8 *param1) { return FUN_02030ADC(param0, param1, 0); } -THUMB_FUNC u32 FUN_020311DC(u32 param0) +u32 FUN_020311DC(u32 param0) { return FUN_02030ADC(param0, 0, 0); } -THUMB_FUNC u32 FUN_020311E8() +u32 FUN_020311E8() { return FUN_0202EE24(); } -THUMB_FUNC BOOL FUN_020311F0() +BOOL FUN_020311F0() { if (FUN_02031280() != 0) { @@ -2223,7 +2224,7 @@ THUMB_FUNC BOOL FUN_020311F0() return FUN_0202EE60(); } -THUMB_FUNC int FUN_02031228(u16 param0) +int FUN_02031228(u16 param0) { if (FUN_0202D858(param0) >= 5) { @@ -2238,17 +2239,17 @@ THUMB_FUNC int FUN_02031228(u16 param0) return 0x26; } -THUMB_FUNC int FUN_02031248(u32 param0) +int FUN_02031248(u32 param0) { return FUN_0202D858((u16)param0) + 1; } -THUMB_FUNC int FUN_02031258(u32 param0) +int FUN_02031258(u32 param0) { return FUN_0202D884((u16)param0) + 1; } -THUMB_FUNC void FUN_02031268(u8 param0) +void FUN_02031268(u8 param0) { if (UNK_021C59F8 != NULL) { @@ -2256,7 +2257,7 @@ THUMB_FUNC void FUN_02031268(u8 param0) } } -THUMB_FUNC u8 FUN_02031280() +u8 FUN_02031280() { if (UNK_021C59F8 != NULL) { @@ -2266,7 +2267,7 @@ THUMB_FUNC u8 FUN_02031280() return 0; } -THUMB_FUNC void FUN_0203129C() +void FUN_0203129C() { if (FUN_0202F03C() == 0 && FUN_02031190() == 0) { @@ -2278,7 +2279,7 @@ THUMB_FUNC void FUN_0203129C() } #ifdef NONMATCHING -THUMB_FUNC void FUN_020312BC(s64 *param0) +void FUN_020312BC(s64 *param0) { RTCDate st10; RTCTime st4; @@ -2297,7 +2298,7 @@ THUMB_FUNC void FUN_020312BC(s64 *param0) (0x00000000 + r5) << 5; } #else -THUMB_FUNC asm void FUN_020312BC(s64 *param0) +asm void FUN_020312BC(s64 *param0) { // clang-format off push {r3-r7, lr} @@ -2369,27 +2370,27 @@ THUMB_FUNC asm void FUN_020312BC(s64 *param0) } #endif -THUMB_FUNC void FUN_02031354(u32 param0) +void FUN_02031354(u32 param0) { FUN_0202D830(UNK_021C59F8->unk56C, param0); } -THUMB_FUNC u32 FUN_02031370() +u32 FUN_02031370() { return FUN_0202D4E4(UNK_021C59F8->unk56C); } -THUMB_FUNC u32 FUN_02031388() +u32 FUN_02031388() { return FUN_0202D4E4(UNK_021C59F8->unk54C); } -THUMB_FUNC void FUN_020313A0(u8 param0) +void FUN_020313A0(u8 param0) { UNK_021C59F8->unk687 = param0; } -THUMB_FUNC void FUN_020313B4(u8 param0, u32 param1) +void FUN_020313B4(u8 param0, u32 param1) { if (UNK_021C59F8 != NULL) { @@ -2397,7 +2398,7 @@ THUMB_FUNC void FUN_020313B4(u8 param0, u32 param1) } } -THUMB_FUNC u32 FUN_020313CC(u32 param0) +u32 FUN_020313CC(u32 param0) { if (UNK_021C59F8 != NULL) { @@ -2410,7 +2411,7 @@ THUMB_FUNC u32 FUN_020313CC(u32 param0) return param0; } -THUMB_FUNC u32 FUN_020313EC() +u32 FUN_020313EC() { if (FUN_02033534() < 0x13) { @@ -2420,7 +2421,7 @@ THUMB_FUNC u32 FUN_020313EC() return MOD04_021D8624(); } -THUMB_FUNC void FUN_02031400(u32 param0) +void FUN_02031400(u32 param0) { if (FUN_02033534() >= 0x13) { @@ -2434,7 +2435,7 @@ THUMB_FUNC void FUN_02031400(u32 param0) } } -THUMB_FUNC u32 FUN_02031438() +u32 FUN_02031438() { if (UNK_021C59F8->unk681 != 0) { @@ -2444,12 +2445,12 @@ THUMB_FUNC u32 FUN_02031438() return 0; } -THUMB_FUNC void FUN_02031454() +void FUN_02031454() { UNK_021C59F8->unk689 = 1; } -THUMB_FUNC void FUN_02031468() +void FUN_02031468() { if (UNK_021C59F8 != NULL) { diff --git a/arm9/src/unk_02031480.c b/arm9/src/unk_02031480.c index 9639cd741..82ba8c7d3 100644 --- a/arm9/src/unk_02031480.c +++ b/arm9/src/unk_02031480.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_02031480.h" struct UnkStruct_02031480 @@ -13,7 +14,7 @@ struct UnkStruct_02031480 static struct UnkStruct_02031480 *UNK_021C59FC; -THUMB_FUNC void FUN_02031480(u32 heap_id) +void FUN_02031480(u32 heap_id) { if (UNK_021C59FC == NULL) { @@ -30,13 +31,13 @@ THUMB_FUNC void FUN_02031480(u32 heap_id) UNK_021C59FC->unk252 = 0x00; } -THUMB_FUNC void FUN_020314D0() +void FUN_020314D0() { FreeToHeap(UNK_021C59FC); UNK_021C59FC = NULL; } -THUMB_FUNC BOOL FUN_020314E8() +BOOL FUN_020314E8() { if (UNK_021C59FC != NULL) { @@ -46,7 +47,7 @@ THUMB_FUNC BOOL FUN_020314E8() return FALSE; } -THUMB_FUNC void FUN_020314FC(u8 param0, u32 unused, u8 *param2) +void FUN_020314FC(u8 param0, u32 unused, u8 *param2) { #pragma unused(unused) u8 st0[3]; @@ -78,27 +79,27 @@ THUMB_FUNC void FUN_020314FC(u8 param0, u32 unused, u8 *param2) } } -THUMB_FUNC void FUN_02031560(u32 unused1, u32 unused2, u8 *param2) +void FUN_02031560(u32 unused1, u32 unused2, u8 *param2) { #pragma unused(unused1) #pragma unused(unused2) UNK_021C59FC->unk010[param2[0]] = param2[1]; } -THUMB_FUNC void FUN_02031574(u32 unused1, u32 unused2, u8 *param2) +void FUN_02031574(u32 unused1, u32 unused2, u8 *param2) { #pragma unused(unused1) #pragma unused(unused2) UNK_021C59FC->unk250 = *param2; } -THUMB_FUNC void FUN_02031588(u8 param0) +void FUN_02031588(u8 param0) { UNK_021C59FC->unk251 = param0; UNK_021C59FC->unk252 = 1; } -THUMB_FUNC void FUN_020315A4() +void FUN_020315A4() { if (UNK_021C59FC != NULL && UNK_021C59FC->unk252 != 0 && FUN_020311D0(0x10, &UNK_021C59FC->unk251)) @@ -107,7 +108,7 @@ THUMB_FUNC void FUN_020315A4() } } -THUMB_FUNC BOOL FUN_020315D8(u8 param0) +BOOL FUN_020315D8(u8 param0) { if (UNK_021C59FC == NULL) { @@ -122,31 +123,31 @@ THUMB_FUNC BOOL FUN_020315D8(u8 param0) return FALSE; } -THUMB_FUNC u8 FUN_020315FC(u8 index) +u8 FUN_020315FC(u8 index) { return UNK_021C59FC->unk010[index]; } -THUMB_FUNC void FUN_0203160C(u32 param0, u32 unused, u8 *param2) +void FUN_0203160C(u32 param0, u32 unused, u8 *param2) { #pragma unused(unused) UNK_021C59FC->unk000[param0][0] = param2[0]; UNK_021C59FC->unk000[param0][1] = param2[1]; } -THUMB_FUNC u32 FUN_02031628() +u32 FUN_02031628() { return 2; } -THUMB_FUNC void FUN_0203162C(u8 param0, u8 param1) +void FUN_0203162C(u8 param0, u8 param1) { u8 st0[2] = { param0, param1 }; FUN_020311D0(0x13, st0); } -THUMB_FUNC int FUN_02031640(u32 param0, u8 param1) +int FUN_02031640(u32 param0, u8 param1) { if (UNK_021C59FC == NULL) { @@ -161,7 +162,7 @@ THUMB_FUNC int FUN_02031640(u32 param0, u8 param1) return -1; } -THUMB_FUNC void FUN_02031668() +void FUN_02031668() { for (int i = 0; i < 8; i++) { @@ -169,7 +170,7 @@ THUMB_FUNC void FUN_02031668() } } -THUMB_FUNC void FUN_0203168C() +void FUN_0203168C() { for (int i = 0; i < 8; i++) { @@ -177,7 +178,7 @@ THUMB_FUNC void FUN_0203168C() } } -THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1) +BOOL FUN_020316AC(u32 param0, void *param1) { if (UNK_021C59FC != NULL) { @@ -190,7 +191,7 @@ THUMB_FUNC BOOL FUN_020316AC(u32 param0, void *param1) return FALSE; } -THUMB_FUNC u8 *FUN_020316E0(int param0) +u8 *FUN_020316E0(int param0) { if (UNK_021C59FC->unk248[param0] != 0) { @@ -200,14 +201,14 @@ THUMB_FUNC u8 *FUN_020316E0(int param0) return NULL; } -THUMB_FUNC void FUN_02031704(u32 param0, u32 unused, void *param2) +void FUN_02031704(u32 param0, u32 unused, void *param2) { #pragma unused(unused) UNK_021C59FC->unk248[param0] = 1; MI_CpuCopy8(param2, UNK_021C59FC->unk018[param0], 0x46); } -THUMB_FUNC u32 FUN_02031730() +u32 FUN_02031730() { return 0x46; } diff --git a/arm9/src/unk_02031734.c b/arm9/src/unk_02031734.c index d15e02d97..74d46cbb5 100644 --- a/arm9/src/unk_02031734.c +++ b/arm9/src/unk_02031734.c @@ -55,7 +55,7 @@ extern MOD05_021D74E0(struct SaveBlock2 *sav2, u32 param1); extern void MOD04_021D83A8(void (*param0)(s32)); extern void FUN_0200541C(); -THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1) +void FUN_02031734(struct SaveBlock2 *sav2, u8 param1) { if (UNK_021C5A00 == NULL) { @@ -85,7 +85,7 @@ THUMB_FUNC void FUN_02031734(struct SaveBlock2 *sav2, u8 param1) } } -THUMB_FUNC void FUN_020317C0() +void FUN_020317C0() { if (UNK_021C5A00 != NULL) { @@ -110,7 +110,7 @@ THUMB_FUNC void FUN_020317C0() } } -THUMB_FUNC BOOL FUN_02031810() +BOOL FUN_02031810() { if (UNK_021C5A00 != NULL) { @@ -119,7 +119,7 @@ THUMB_FUNC BOOL FUN_02031810() return FALSE; } -THUMB_FUNC void FUN_02031824(struct SaveBlock2 *sav2) +void FUN_02031824(struct SaveBlock2 *sav2) { if (UNK_021C5A00 == NULL) { @@ -131,7 +131,7 @@ THUMB_FUNC void FUN_02031824(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_02031860() +void FUN_02031860() { if (UNK_021C5A00 != NULL) { @@ -140,7 +140,7 @@ THUMB_FUNC void FUN_02031860() } } -THUMB_FUNC void FUN_02031880() +void FUN_02031880() { FUN_0202FC60(); UNK_021C5A00->unk38 = FUN_02031190(); @@ -148,17 +148,17 @@ THUMB_FUNC void FUN_02031880() FUN_02031D20(FUN_020321B8, 0); } -THUMB_FUNC void FUN_020318A4(u8 param0) +void FUN_020318A4(u8 param0) { UNK_021C5A00->unk4F = param0; } -THUMB_FUNC void FUN_020318B4() +void FUN_020318B4() { FUN_02031D20(FUN_02032028, 0); } -THUMB_FUNC BOOL FUN_020318C4() +BOOL FUN_020318C4() { struct UnkStruct_02031734_const1 st0 = UNK_020EEC50; @@ -181,23 +181,23 @@ THUMB_FUNC BOOL FUN_020318C4() return FALSE; } -THUMB_FUNC void FUN_02031914() +void FUN_02031914() { FUN_02031D20(FUN_02032178, 0); } -THUMB_FUNC void FUN_02031924() +void FUN_02031924() { UNK_021C5A00->unk4C = 1; } -THUMB_FUNC void FUN_02031934() +void FUN_02031934() { FUN_0202E49C(); FUN_02031D20(FUN_02032194, 0); } -THUMB_FUNC void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3) +void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3) { if (FUN_02030F40() == 0) { @@ -209,7 +209,7 @@ THUMB_FUNC void FUN_02031948(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 } } -THUMB_FUNC void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3) +void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 param3) { if (FUN_02030F40() == 0) { @@ -221,19 +221,19 @@ THUMB_FUNC void FUN_02031990(struct SaveBlock2 *sav2, u8 param1, u8 param2, u32 } } -THUMB_FUNC void FUN_020319D8(u8 param0) +void FUN_020319D8(u8 param0) { UNK_021C5A00->unk3E = param0; FUN_02031D20(FUN_02032298, 0); } -THUMB_FUNC void FUN_020319F4() +void FUN_020319F4() { FUN_0202FCA8(); FUN_02031D20(FUN_02032364, 0); } -THUMB_FUNC void FUN_02031A08() +void FUN_02031A08() { if (UNK_021C5A00 != NULL) { @@ -241,12 +241,12 @@ THUMB_FUNC void FUN_02031A08() } } -THUMB_FUNC void FUN_02031A24() +void FUN_02031A24() { FUN_0202D298(); } -THUMB_FUNC BOOL FUN_02031A2C() +BOOL FUN_02031A2C() { struct UnkStruct_02031734_const1 st0 = UNK_020EEC5C; @@ -269,7 +269,7 @@ THUMB_FUNC BOOL FUN_02031A2C() return FALSE; } -THUMB_FUNC void FUN_02031A7C(struct SaveBlock2 *sav2) +void FUN_02031A7C(struct SaveBlock2 *sav2) { if (UNK_021C5A00 == NULL) { @@ -285,7 +285,7 @@ THUMB_FUNC void FUN_02031A7C(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_02031AC8(u8 param0) +void FUN_02031AC8(u8 param0) { UNK_021C5A00->unk3E = param0; UNK_021C5A00->unk38 = 3; @@ -294,7 +294,7 @@ THUMB_FUNC void FUN_02031AC8(u8 param0) FUN_02031D20(FUN_02032628, 0); } -THUMB_FUNC s32 FUN_02031AF4() +s32 FUN_02031AF4() { if (UNK_021C5A00 == NULL) { @@ -313,7 +313,7 @@ THUMB_FUNC s32 FUN_02031AF4() return 0; } -THUMB_FUNC BOOL FUN_02031B2C() +BOOL FUN_02031B2C() { if (UNK_021C5A00 == NULL) { @@ -327,7 +327,7 @@ THUMB_FUNC BOOL FUN_02031B2C() return FALSE; } -THUMB_FUNC void FUN_02031B50() +void FUN_02031B50() { FUN_0202D344(0); if (UNK_021C5A00->unk44 != 1 || UNK_021C5A00->unk45 != 1 || UNK_021C5A00->unk3F == 9) @@ -350,7 +350,7 @@ THUMB_FUNC void FUN_02031B50() FUN_02031D20(FUN_02032424, 5); } -THUMB_FUNC u32 FUN_02031BD0() +u32 FUN_02031BD0() { if (UNK_021C5A00 == NULL) { @@ -365,7 +365,7 @@ THUMB_FUNC u32 FUN_02031BD0() return 0; } -THUMB_FUNC void FUN_02031BF4() +void FUN_02031BF4() { if (UNK_021C5A00 != NULL) { @@ -373,7 +373,7 @@ THUMB_FUNC void FUN_02031BF4() } } -THUMB_FUNC void FUN_02031C10() +void FUN_02031C10() { if (UNK_021C5A00 != NULL) { @@ -382,7 +382,7 @@ THUMB_FUNC void FUN_02031C10() } } -THUMB_FUNC void FUN_02031C2C() +void FUN_02031C2C() { if (UNK_021C5A00 != NULL) { @@ -392,17 +392,17 @@ THUMB_FUNC void FUN_02031C2C() } } -THUMB_FUNC void FUN_02031C54() +void FUN_02031C54() { UNK_021C5A00->unk3F = 0x12; } -THUMB_FUNC void FUN_02031C64() +void FUN_02031C64() { UNK_021C5A00->unk3F = 0x9; } -THUMB_FUNC void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1) +void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1) { if (FUN_02030F40() == 0) { @@ -412,7 +412,7 @@ THUMB_FUNC void FUN_02031C74(struct SaveBlock2 *sav2, u8 param1) } } -THUMB_FUNC void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1) +void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1) { if (FUN_02030F40() == 0) { @@ -422,7 +422,7 @@ THUMB_FUNC void FUN_02031CA8(struct SaveBlock2 *sav2, u8 param1) } } -THUMB_FUNC void FUN_02031CDC() +void FUN_02031CDC() { if (UNK_021C5A00 != NULL && UNK_021C5A00->unk24 != 0) { @@ -440,13 +440,13 @@ THUMB_FUNC void FUN_02031CDC() } } -THUMB_FUNC void FUN_02031D20(void (*param0)(), u32 param1) +void FUN_02031D20(void (*param0)(), u32 param1) { UNK_021C5A00->unk24 = param0; UNK_021C5A00->unk3A = (u16)param1; } -THUMB_FUNC void FUN_02031D30() +void FUN_02031D30() { if (UNK_021C5A00->unk3A != 0) { @@ -491,7 +491,7 @@ THUMB_FUNC void FUN_02031D30() } } -THUMB_FUNC void FUN_02031E08() +void FUN_02031E08() { if (FUN_0202EE0C() != 0) { @@ -519,7 +519,7 @@ THUMB_FUNC void FUN_02031E08() } } -THUMB_FUNC void FUN_02031E8C() +void FUN_02031E8C() { if (FUN_0202EE0C() != 0) { @@ -533,7 +533,7 @@ THUMB_FUNC void FUN_02031E8C() } } -THUMB_FUNC void FUN_02031EE0() +void FUN_02031EE0() { FUN_0202EA54(); if (UNK_021C5A00->unk4F == 0 && UNK_021C5A00->unk4B == 0) @@ -564,7 +564,7 @@ THUMB_FUNC void FUN_02031EE0() } } -THUMB_FUNC void FUN_02031F60() +void FUN_02031F60() { FUN_0202EA54(); if (FUN_0202E8A0(UNK_021C5A00->unk3E) != 0 && FUN_0202FB18(UNK_021C5A00->unk3E) != 0) @@ -588,7 +588,7 @@ THUMB_FUNC void FUN_02031F60() FUN_02031D20(FUN_02032028, 0); } -THUMB_FUNC void FUN_02031FC8() +void FUN_02031FC8() { if (FUN_02030E7C(FUN_02031190()) != 0) { @@ -614,7 +614,7 @@ THUMB_FUNC void FUN_02031FC8() FUN_02031D20(FUN_02032028, 0); } -THUMB_FUNC void FUN_02032028() +void FUN_02032028() { if (FUN_0202E6F0() != 0) { @@ -622,7 +622,7 @@ THUMB_FUNC void FUN_02032028() } } -THUMB_FUNC void FUN_02032040() +void FUN_02032040() { if (FUN_0202E6F0() != 0) { @@ -630,7 +630,7 @@ THUMB_FUNC void FUN_02032040() } } -THUMB_FUNC void FUN_02032058() +void FUN_02032058() { if (FUN_0202EE0C() != 0) { @@ -645,7 +645,7 @@ THUMB_FUNC void FUN_02032058() } } -THUMB_FUNC void FUN_020320C4() +void FUN_020320C4() { if (FUN_020311E8() != 0) { @@ -666,7 +666,7 @@ THUMB_FUNC void FUN_020320C4() } } -THUMB_FUNC void FUN_02032118() +void FUN_02032118() { FUN_02031268(0); FUN_0202EE84(1); @@ -674,14 +674,14 @@ THUMB_FUNC void FUN_02032118() FUN_02031D20(FUN_02032138, 0); } -THUMB_FUNC void FUN_02032138() +void FUN_02032138() { } -THUMB_FUNC void FUN_0203213C() +void FUN_0203213C() { } -THUMB_FUNC void FUN_02032140() +void FUN_02032140() { if (UNK_021C5A00->unk3F < 0x13) { @@ -698,7 +698,7 @@ THUMB_FUNC void FUN_02032140() FUN_02031D20(FUN_020323B8, 0); } -THUMB_FUNC void FUN_02032178() +void FUN_02032178() { if (FUN_0202E6F0() != 0) { @@ -707,7 +707,7 @@ THUMB_FUNC void FUN_02032178() } } -THUMB_FUNC void FUN_02032194() +void FUN_02032194() { if (FUN_0202E4C8()) { @@ -717,7 +717,7 @@ THUMB_FUNC void FUN_02032194() } } -THUMB_FUNC void FUN_020321B8() +void FUN_020321B8() { if (FUN_0202E6F0() != 0) { @@ -725,7 +725,7 @@ THUMB_FUNC void FUN_020321B8() } } -THUMB_FUNC void FUN_020321D0() +void FUN_020321D0() { if (FUN_0202E4C8()) { @@ -739,7 +739,7 @@ THUMB_FUNC void FUN_020321D0() } } -THUMB_FUNC void FUN_02032218() +void FUN_02032218() { if (FUN_02030E7C(FUN_02031190()) != 0) { @@ -747,7 +747,7 @@ THUMB_FUNC void FUN_02032218() } } -THUMB_FUNC void FUN_02032234() +void FUN_02032234() { if (FUN_02030F40() == 0) { @@ -755,7 +755,7 @@ THUMB_FUNC void FUN_02032234() } } -THUMB_FUNC void FUN_0203224C() +void FUN_0203224C() { if (FUN_0202E4C8()) { @@ -769,12 +769,12 @@ THUMB_FUNC void FUN_0203224C() } } -THUMB_FUNC void FUN_02032290() +void FUN_02032290() { FUN_0202EA54(); } -THUMB_FUNC void FUN_02032298() +void FUN_02032298() { FUN_0202EA54(); if (FUN_0202FB18(UNK_021C5A00->unk3E) != 0) @@ -783,7 +783,7 @@ THUMB_FUNC void FUN_02032298() } } -THUMB_FUNC void FUN_020322C0() +void FUN_020322C0() { if (FUN_020311F0() != 0) { @@ -796,13 +796,13 @@ THUMB_FUNC void FUN_020322C0() } } -THUMB_FUNC void FUN_020322F8() +void FUN_020322F8() { FUN_0202E6F0(); FUN_02031D20(FUN_0203230C, 2); } -THUMB_FUNC void FUN_0203230C() +void FUN_0203230C() { if (UNK_021C5A00->unk3A != 0) { @@ -817,7 +817,7 @@ THUMB_FUNC void FUN_0203230C() } } -THUMB_FUNC void FUN_0203234C() +void FUN_0203234C() { if (FUN_02030F40() == 0) { @@ -825,13 +825,13 @@ THUMB_FUNC void FUN_0203234C() } } -THUMB_FUNC void FUN_02032364() +void FUN_02032364() { FUN_0202E6F0(); FUN_02031D20(FUN_02032378, 2); } -THUMB_FUNC void FUN_02032378() +void FUN_02032378() { if (UNK_021C5A00->unk3A != 0) { @@ -846,11 +846,11 @@ THUMB_FUNC void FUN_02032378() } } -THUMB_FUNC void FUN_020323B8() +void FUN_020323B8() { } -THUMB_FUNC void FUN_020323BC() +void FUN_020323BC() { if (FUN_02030F40() == 0) { @@ -858,12 +858,12 @@ THUMB_FUNC void FUN_020323BC() } } -THUMB_FUNC void FUN_020323CC() +void FUN_020323CC() { FUN_02031D20(FUN_02032440, 5); } -THUMB_FUNC void FUN_020323DC() +void FUN_020323DC() { if (FUN_02030F20() <= 1) { @@ -883,7 +883,7 @@ THUMB_FUNC void FUN_020323DC() FUN_02031D20(FUN_020324F8, 0); } -THUMB_FUNC void FUN_02032424() +void FUN_02032424() { if (FUN_0202E6F0() != 0) { @@ -892,7 +892,7 @@ THUMB_FUNC void FUN_02032424() } } -THUMB_FUNC void FUN_02032440() +void FUN_02032440() { if (UNK_021C5A00->unk3A != 0) { @@ -906,7 +906,7 @@ THUMB_FUNC void FUN_02032440() } } -THUMB_FUNC void FUN_02032478() +void FUN_02032478() { if (FUN_0202E4C8()) { @@ -921,7 +921,7 @@ THUMB_FUNC void FUN_02032478() } } -THUMB_FUNC void FUN_020324C8() +void FUN_020324C8() { FUN_0202EA54(); if (UNK_021C5A00->unk3A != 0) @@ -936,7 +936,7 @@ THUMB_FUNC void FUN_020324C8() } } -THUMB_FUNC void FUN_020324F8() +void FUN_020324F8() { if (FUN_0202E6F0() != 0) { @@ -944,7 +944,7 @@ THUMB_FUNC void FUN_020324F8() } } -THUMB_FUNC void FUN_02032510() +void FUN_02032510() { if (FUN_0202EE0C() != 0 && FUN_0202F918(0, UNK_021C5A00->unk43, 0x200, 1) != 0) { @@ -959,7 +959,7 @@ THUMB_FUNC void FUN_02032510() } } -THUMB_FUNC void FUN_02032578() +void FUN_02032578() { if (!FUN_0202F104()) { @@ -984,7 +984,7 @@ THUMB_FUNC void FUN_02032578() } } -THUMB_FUNC void FUN_020325D0() +void FUN_020325D0() { if (FUN_0202EE0C() != 0 && FUN_0202F950(0, 0, 0x200) != 0) { @@ -996,7 +996,7 @@ THUMB_FUNC void FUN_020325D0() } } -THUMB_FUNC void FUN_02032628() +void FUN_02032628() { if (FUN_0202E6F0() != 0) { @@ -1004,7 +1004,7 @@ THUMB_FUNC void FUN_02032628() } } -THUMB_FUNC void FUN_02032640() +void FUN_02032640() { if (FUN_0202EE0C() != 0 && FUN_0202F950(0, 0, 0x200)) { @@ -1013,7 +1013,7 @@ THUMB_FUNC void FUN_02032640() } } -THUMB_FUNC void FUN_0203266C() +void FUN_0203266C() { if (FUN_0202E8A0(UNK_021C5A00->unk3E) != 0 && FUN_0202FB18(UNK_021C5A00->unk3E) != 0) { @@ -1036,7 +1036,7 @@ THUMB_FUNC void FUN_0203266C() FUN_02031D20(FUN_020327B8, 0); } -THUMB_FUNC void FUN_020326D0() +void FUN_020326D0() { if (FUN_020311F0() != 0) { @@ -1061,7 +1061,7 @@ THUMB_FUNC void FUN_020326D0() FUN_02031D20(FUN_020327B8, 0); } -THUMB_FUNC void FUN_02032738() +void FUN_02032738() { if (FUN_020311F0() != 0) { @@ -1090,7 +1090,7 @@ THUMB_FUNC void FUN_02032738() FUN_02031D20(FUN_020327B8, 0); } -THUMB_FUNC void FUN_0203279C() +void FUN_0203279C() { if (FUN_020311F0() != 0) { @@ -1098,11 +1098,11 @@ THUMB_FUNC void FUN_0203279C() } } -THUMB_FUNC void FUN_020327B4() +void FUN_020327B4() { } -THUMB_FUNC void FUN_020327B8() +void FUN_020327B8() { UNK_021C5A00->unk3D = 0; if (FUN_0202E6F0() != 0) @@ -1118,7 +1118,7 @@ THUMB_FUNC void FUN_020327B8() } } -THUMB_FUNC void FUN_020327FC() +void FUN_020327FC() { if (FUN_020311E8() == 0) { @@ -1138,7 +1138,7 @@ THUMB_FUNC void FUN_020327FC() } } -THUMB_FUNC void FUN_02032850() +void FUN_02032850() { if (FUN_0202EE0C() != 0) { @@ -1150,7 +1150,7 @@ THUMB_FUNC void FUN_02032850() } } -THUMB_FUNC void FUN_02032888() +void FUN_02032888() { u8 st0[4]; UNK_021C5A00->unk3F = 0xd; @@ -1165,19 +1165,19 @@ THUMB_FUNC void FUN_02032888() FUN_020311D0(0xa, st0); } -THUMB_FUNC void FUN_020328C0(u8 param0) +void FUN_020328C0(u8 param0) { UNK_021C5A00->unk3E = param0; UNK_021C5A00->unk38 = 3; FUN_02031D20(FUN_02032924, 0); } -THUMB_FUNC void FUN_020328E4() +void FUN_020328E4() { UNK_021C5A00->unk3F = 7; } -THUMB_FUNC void FUN_020328F4(u8 param0) +void FUN_020328F4(u8 param0) { UNK_021C5A00->unk3E = param0; UNK_021C5A00->unk3F = 7; @@ -1186,7 +1186,7 @@ THUMB_FUNC void FUN_020328F4(u8 param0) FUN_02031D20(FUN_02032628, 0); } -THUMB_FUNC void FUN_02032924() +void FUN_02032924() { if (FUN_0202E6F0() != 0) { @@ -1194,7 +1194,7 @@ THUMB_FUNC void FUN_02032924() } } -THUMB_FUNC void FUN_0203293C() +void FUN_0203293C() { if (FUN_0202EE0C() != 0) { @@ -1207,7 +1207,7 @@ THUMB_FUNC void FUN_0203293C() } } -THUMB_FUNC void FUN_02032978() +void FUN_02032978() { if (FUN_0202E8A0(UNK_021C5A00->unk3E) != 0 && FUN_0202FB18(UNK_021C5A00->unk3E) != 0) { @@ -1235,7 +1235,7 @@ THUMB_FUNC void FUN_02032978() } } -THUMB_FUNC void FUN_020329F4() +void FUN_020329F4() { if (UNK_021C5A00->unk3A > 0x5a) { @@ -1278,7 +1278,7 @@ THUMB_FUNC void FUN_020329F4() FUN_02031D20(FUN_02032924, 0); } -THUMB_FUNC void FUN_02032A8C(u8 param0, u32 param1, u8 *param2) +void FUN_02032A8C(u8 param0, u32 param1, u8 *param2) { #pragma unused(param1) if (FUN_02031190() == 0) @@ -1307,7 +1307,7 @@ THUMB_FUNC void FUN_02032A8C(u8 param0, u32 param1, u8 *param2) } } -THUMB_FUNC void FUN_02032AEC(u32 param0, u32 param1, u8 *param2) +void FUN_02032AEC(u32 param0, u32 param1, u8 *param2) { #pragma unused(param0) #pragma unused(param1) @@ -1356,12 +1356,12 @@ THUMB_FUNC void FUN_02032AEC(u32 param0, u32 param1, u8 *param2) } } -THUMB_FUNC u32 FUN_02032B68() +u32 FUN_02032B68() { return 6; } -THUMB_FUNC void FUN_02032B6C(u8 param0) +void FUN_02032B6C(u8 param0) { if (UNK_021C5A00 != NULL) { @@ -1370,12 +1370,12 @@ THUMB_FUNC void FUN_02032B6C(u8 param0) } } -THUMB_FUNC void FUN_02032B84() +void FUN_02032B84() { FUN_0202EA54(); } -THUMB_FUNC void FUN_02032B8C() +void FUN_02032B8C() { if (FUN_0202E4C8()) { @@ -1389,7 +1389,7 @@ THUMB_FUNC void FUN_02032B8C() } } -THUMB_FUNC void FUN_02032BD0(struct SaveBlock2 *sav2) +void FUN_02032BD0(struct SaveBlock2 *sav2) { if (FUN_02030F40() == 0) { @@ -1400,7 +1400,7 @@ THUMB_FUNC void FUN_02032BD0(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_02032C0C() +void FUN_02032C0C() { if (UNK_021C5A00 != NULL) { @@ -1408,7 +1408,7 @@ THUMB_FUNC void FUN_02032C0C() } } -THUMB_FUNC u32 FUN_02032C28() +u32 FUN_02032C28() { struct UnkStruct_02031734_const2 st0 = UNK_020EEC48; @@ -1432,7 +1432,7 @@ THUMB_FUNC u32 FUN_02032C28() return 0; } -THUMB_FUNC void FUN_02032C6C(u32 param0, u32 param1) +void FUN_02032C6C(u32 param0, u32 param1) { switch (param0) { @@ -1460,7 +1460,7 @@ THUMB_FUNC void FUN_02032C6C(u32 param0, u32 param1) } } -THUMB_FUNC void FUN_02032CF4() +void FUN_02032CF4() { if (FUN_0202E4C8()) { @@ -1475,7 +1475,7 @@ THUMB_FUNC void FUN_02032CF4() } } -THUMB_FUNC void FUN_02032D44(struct SaveBlock2 *sav2) +void FUN_02032D44(struct SaveBlock2 *sav2) { if (FUN_02030F40() == 0) { @@ -1486,7 +1486,7 @@ THUMB_FUNC void FUN_02032D44(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_02032D80() +void FUN_02032D80() { if (UNK_021C5A00 != NULL) { @@ -1494,12 +1494,12 @@ THUMB_FUNC void FUN_02032D80() } } -THUMB_FUNC u8 FUN_02032D9C() +u8 FUN_02032D9C() { return UNK_021C5A00->unk49; } -THUMB_FUNC BOOL FUN_02032DAC() +BOOL FUN_02032DAC() { FUN_02031468(); @@ -1526,7 +1526,7 @@ THUMB_FUNC BOOL FUN_02032DAC() return FALSE; } -THUMB_FUNC void FUN_02032E00() +void FUN_02032E00() { if (FUN_0202E4C8()) { @@ -1540,7 +1540,7 @@ THUMB_FUNC void FUN_02032E00() } } -THUMB_FUNC void FUN_02032E48() +void FUN_02032E48() { if (FUN_0202E4C8()) { @@ -1554,11 +1554,11 @@ THUMB_FUNC void FUN_02032E48() } } -THUMB_FUNC void FUN_02032E8C() +void FUN_02032E8C() { } -THUMB_FUNC void FUN_02032E90() +void FUN_02032E90() { if (MOD04_021D7F8C() < 0) { @@ -1566,15 +1566,15 @@ THUMB_FUNC void FUN_02032E90() } } -THUMB_FUNC void FUN_02032EA8() +void FUN_02032EA8() { } -THUMB_FUNC void FUN_02032EAC() +void FUN_02032EAC() { } -THUMB_FUNC void FUN_02032EB0() +void FUN_02032EB0() { FUN_020313A0(1); @@ -1609,7 +1609,7 @@ THUMB_FUNC void FUN_02032EB0() } } -THUMB_FUNC void FUN_02032F20(u32 param0) +void FUN_02032F20(u32 param0) { if (param0 + 2 > 1) { @@ -1619,7 +1619,7 @@ THUMB_FUNC void FUN_02032F20(u32 param0) UNK_021C5A00->unk34 = param0; } -THUMB_FUNC void FUN_02032F34() +void FUN_02032F34() { s32 res = MOD04_021D7800(0); if (res >= 0xa) @@ -1654,7 +1654,7 @@ THUMB_FUNC void FUN_02032F34() } } -THUMB_FUNC void FUN_02032F98() +void FUN_02032F98() { s32 res = MOD04_021D7800(1); if (res < 0) @@ -1671,7 +1671,7 @@ THUMB_FUNC void FUN_02032F98() } } -THUMB_FUNC u32 FUN_02032FDC(u8 param0) +u32 FUN_02032FDC(u8 param0) { MOD04_021D77C4(FUN_020303BC, FUN_02030238); UNK_021C5A00->unk42 = param0; @@ -1680,7 +1680,7 @@ THUMB_FUNC u32 FUN_02032FDC(u8 param0) return 1; } -THUMB_FUNC u32 FUN_0203300C() +u32 FUN_0203300C() { if (UNK_021C5A00->unk24 == FUN_02032F34) { @@ -1710,7 +1710,7 @@ THUMB_FUNC u32 FUN_0203300C() return 2; } -THUMB_FUNC void FUN_02033060() +void FUN_02033060() { MOD04_021D77C4(FUN_020303BC, FUN_02030238); if (MOD04_021D8494(-1) != 0) @@ -1721,7 +1721,7 @@ THUMB_FUNC void FUN_02033060() } } -THUMB_FUNC void FUN_020330A0() +void FUN_020330A0() { FUN_020313A0(0); if (MOD04_021D82BC(UNK_021C5A00->unk41) != 0) @@ -1737,7 +1737,7 @@ THUMB_FUNC void FUN_020330A0() } } -THUMB_FUNC void FUN_020330E4() +void FUN_020330E4() { if (FUN_02031190() == 0) { @@ -1753,12 +1753,12 @@ THUMB_FUNC void FUN_020330E4() UNK_021C5A00->unk4D = 1; } -THUMB_FUNC u8 FUN_02033128() +u8 FUN_02033128() { return UNK_021C5A00->unk4D; } -THUMB_FUNC u32 FUN_02033138() +u32 FUN_02033138() { if (UNK_021C5A00->unk24 == FUN_02033060) { @@ -1768,7 +1768,7 @@ THUMB_FUNC u32 FUN_02033138() return 0; } -THUMB_FUNC u32 FUN_02033154() +u32 FUN_02033154() { if (UNK_021C5A00->unk24 == FUN_02032F34) { @@ -1783,12 +1783,12 @@ THUMB_FUNC u32 FUN_02033154() return 0; } -THUMB_FUNC u32 FUN_02033180() +u32 FUN_02033180() { return UNK_021C5A00->unk34; } -THUMB_FUNC void FUN_0203318C() +void FUN_0203318C() { FUN_020313A0(0); if (MOD04_021D82BC(0) != 0) @@ -1803,7 +1803,7 @@ THUMB_FUNC void FUN_0203318C() } } -THUMB_FUNC void FUN_020331C4() +void FUN_020331C4() { if (UNK_021C5A00 != NULL) { @@ -1812,7 +1812,7 @@ THUMB_FUNC void FUN_020331C4() } } -THUMB_FUNC void FUN_020331E8() +void FUN_020331E8() { if (UNK_021C5A00 != NULL) { @@ -1821,7 +1821,7 @@ THUMB_FUNC void FUN_020331E8() } } -THUMB_FUNC void FUN_02033208() +void FUN_02033208() { if (UNK_021C5A00 != NULL) { @@ -1838,13 +1838,13 @@ THUMB_FUNC void FUN_02033208() } } -THUMB_FUNC void FUN_0203323C() +void FUN_0203323C() { u8 res = (u8)FUN_02031190(); FUN_020311D0(0x15, &res); } -THUMB_FUNC u32 FUN_02033250() +u32 FUN_02033250() { if (UNK_021C5A00 != NULL) { @@ -1862,7 +1862,7 @@ THUMB_FUNC u32 FUN_02033250() return 0; } -THUMB_FUNC void FUN_02033288(struct SaveBlock2 *sav2) +void FUN_02033288(struct SaveBlock2 *sav2) { if (UNK_021C5A00 == NULL) { @@ -1879,7 +1879,7 @@ THUMB_FUNC void FUN_02033288(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_020332DC() +void FUN_020332DC() { if (UNK_021C5A00 != 0) { @@ -1891,7 +1891,7 @@ THUMB_FUNC void FUN_020332DC() } } -THUMB_FUNC void FUN_02033310(struct SaveBlock2 *sav2) +void FUN_02033310(struct SaveBlock2 *sav2) { if (UNK_021C5A00 == NULL) { @@ -1907,7 +1907,7 @@ THUMB_FUNC void FUN_02033310(struct SaveBlock2 *sav2) } } -THUMB_FUNC void FUN_02033364() +void FUN_02033364() { if (UNK_021C5A00 != 0) { @@ -1919,7 +1919,7 @@ THUMB_FUNC void FUN_02033364() } } -THUMB_FUNC u32 FUN_02033398() +u32 FUN_02033398() { u32 st4; u32 st0; @@ -1947,7 +1947,7 @@ THUMB_FUNC u32 FUN_02033398() return 0; } -THUMB_FUNC void FUN_020333F0() +void FUN_020333F0() { s32 res = MOD04_021D76AC(); if (res < 0) @@ -1962,7 +1962,7 @@ THUMB_FUNC void FUN_020333F0() } } -THUMB_FUNC void FUN_0203341C() +void FUN_0203341C() { if (FUN_0202E4C8()) { @@ -1977,7 +1977,7 @@ THUMB_FUNC void FUN_0203341C() } } -THUMB_FUNC void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1) +void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1) { Save_PlayerData_GetProfileAddr(sav2); if (FUN_02030F40() != 0) @@ -1998,12 +1998,12 @@ THUMB_FUNC void *FUN_0203346C(struct SaveBlock2 *sav2, u32 param1) return UNK_021C5A00->unk00; } -THUMB_FUNC void *FUN_020334DC() +void *FUN_020334DC() { return UNK_021C5A00->unk00; } -THUMB_FUNC void FUN_020334E8(u8 param0, u8 param1) +void FUN_020334E8(u8 param0, u8 param1) { if (UNK_021C5A00 != NULL) { @@ -2015,7 +2015,7 @@ THUMB_FUNC void FUN_020334E8(u8 param0, u8 param1) FUN_0202EEB0(param0); } -THUMB_FUNC u8 FUN_02033510() +u8 FUN_02033510() { if (UNK_021C5A00 != NULL) { @@ -2030,7 +2030,7 @@ THUMB_FUNC u8 FUN_02033510() return 0; } -THUMB_FUNC s32 FUN_02033534() +s32 FUN_02033534() { if (UNK_021C5A00 != NULL) { @@ -2040,7 +2040,7 @@ THUMB_FUNC s32 FUN_02033534() return 1; } -THUMB_FUNC u8 FUN_0203354C() +u8 FUN_0203354C() { if (UNK_021C5A00 != NULL) { @@ -2050,17 +2050,17 @@ THUMB_FUNC u8 FUN_0203354C() return 0; } -THUMB_FUNC void FUN_02033564(void *src) +void FUN_02033564(void *src) { MI_CpuCopy8(src, UNK_021C5A00->unk04, 0x6); } -THUMB_FUNC void FUN_02033578(void *dst) +void FUN_02033578(void *dst) { MI_CpuCopy8(UNK_021C5A00->unk04, dst, 0x6); } -THUMB_FUNC u32 FUN_02033590() +u32 FUN_02033590() { if (FUN_02033534() >= 0x13) { @@ -2070,7 +2070,7 @@ THUMB_FUNC u32 FUN_02033590() return 0; } -THUMB_FUNC void FUN_020335A4(u8 param0) +void FUN_020335A4(u8 param0) { if (UNK_021C5A00 != NULL) { @@ -2078,7 +2078,7 @@ THUMB_FUNC void FUN_020335A4(u8 param0) } } -THUMB_FUNC u8 FUN_020335B8() +u8 FUN_020335B8() { if (UNK_021C5A00 != NULL) { @@ -2088,7 +2088,7 @@ THUMB_FUNC u8 FUN_020335B8() return 0; } -THUMB_FUNC void FUN_020335D0(s32 param0) +void FUN_020335D0(s32 param0) { ShowCommunicationError(0, 1, param0); while (TRUE) @@ -2096,7 +2096,7 @@ THUMB_FUNC void FUN_020335D0(s32 param0) } } -THUMB_FUNC void FUN_020335E0() +void FUN_020335E0() { ShowCommunicationError(0, 4, 0); while (TRUE) @@ -2104,11 +2104,11 @@ THUMB_FUNC void FUN_020335E0() } } -THUMB_FUNC void FUN_020335F0() +void FUN_020335F0() { } -THUMB_FUNC void FUN_020335F4() +void FUN_020335F4() { if (FUN_02033510() != 0) { @@ -2145,7 +2145,7 @@ THUMB_FUNC void FUN_020335F4() } } -THUMB_FUNC BOOL FUN_02033678() +BOOL FUN_02033678() { if (FUN_0202EDD8() || !FUN_02031810()) { @@ -2160,7 +2160,7 @@ THUMB_FUNC BOOL FUN_02033678() return FALSE; } -THUMB_FUNC u32 FUN_020336A0(u8 param0) +u32 FUN_020336A0(u8 param0) { if (UNK_021C5A00 != NULL) { diff --git a/arm9/src/unk_02033778.c b/arm9/src/unk_02033778.c index fa2a67da0..c2a8ab0f8 100644 --- a/arm9/src/unk_02033778.c +++ b/arm9/src/unk_02033778.c @@ -9,7 +9,7 @@ extern u32 FUN_0202E044(s32 param0); extern u32 FUN_02029B40(u32 param0, u32 param1, u32 param2, u32 language); extern void FUN_02029B90(u32 param0, u32 param1, u32 param2, u32 param3); -THUMB_FUNC void FUN_02033778(u32 param0) +void FUN_02033778(u32 param0) { s32 unk = FUN_02030F20(); if (FUN_0202DFA4(0) != NULL) @@ -24,7 +24,7 @@ THUMB_FUNC void FUN_02033778(u32 param0) } } -THUMB_FUNC void FUN_020337C8(u32 param0, u32 param1, u32 param2, u32 language) +void FUN_020337C8(u32 param0, u32 param1, u32 param2, u32 language) { if (FUN_02029B40(param0, param1, param2, language) == 0) { diff --git a/arm9/src/unk_020337E8.c b/arm9/src/unk_020337E8.c index 856ba3b82..1411784f7 100644 --- a/arm9/src/unk_020337E8.c +++ b/arm9/src/unk_020337E8.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_020337E8.h" #include "heap.h" @@ -16,7 +17,7 @@ extern BOOL DWC_CheckValidConsole(struct DWC_Struct *); extern BOOL DWC_CheckUserData(struct DWC_Struct *); extern s32 DWC_GetGsProfileId(struct DWC_Struct *, struct DWC_token *); -THUMB_FUNC s32 FUN_020337E8(u32 heap_id) +s32 FUN_020337E8(u32 heap_id) { s32 ret = (s32)AllocFromHeap(heap_id, 0x720); s32 ret1 = DWC_Init((ret + 0x1F) & ~0x1F); @@ -24,7 +25,7 @@ THUMB_FUNC s32 FUN_020337E8(u32 heap_id) return ret1; } -THUMB_FUNC void FUN_0203380C(struct DWC_Struct *dwc) +void FUN_0203380C(struct DWC_Struct *dwc) { struct DWC_Struct * dwc1 = FUN_02028228(dwc); if(!DWC_CheckUserData(dwc1)) @@ -34,7 +35,7 @@ THUMB_FUNC void FUN_0203380C(struct DWC_Struct *dwc) } } -THUMB_FUNC s32 FUN_02033830(struct DWC_Struct *dwc) +s32 FUN_02033830(struct DWC_Struct *dwc) { struct DWC_token token; @@ -43,7 +44,7 @@ THUMB_FUNC s32 FUN_02033830(struct DWC_Struct *dwc) return DWC_GetGsProfileId(dwc1, &token); } -THUMB_FUNC BOOL FUN_0203384C(struct SaveBlock2 *sav2) +BOOL FUN_0203384C(struct SaveBlock2 *sav2) { struct DWC_Struct * dwc = FUN_02028228(FUN_020286EC(sav2)); return (DWC_CheckHasProfile(dwc) && DWC_CheckValidConsole(dwc)); diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c index 38ef029b8..55ed2a624 100644 --- a/arm9/src/unk_0204AEA8.c +++ b/arm9/src/unk_0204AEA8.c @@ -6,7 +6,7 @@ extern void MOD05_021E3444(u32, struct FieldSystem *, u32); -THUMB_FUNC BOOL FUN_0204AEA8(struct TaskManager *taskManager) +BOOL FUN_0204AEA8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); u32 *v1 = FUN_0204652C(taskManager); @@ -30,7 +30,7 @@ THUMB_FUNC BOOL FUN_0204AEA8(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2) +void FUN_0204AEF8(struct TaskManager *taskManager, u32 a1, u32 a2) { u32 *v0 = AllocFromHeapAtEnd(11, 4 * sizeof(u32)); diff --git a/arm9/src/unk_0204AF24.c b/arm9/src/unk_0204AF24.c index f91f01ab0..822b2e731 100644 --- a/arm9/src/unk_0204AF24.c +++ b/arm9/src/unk_0204AF24.c @@ -6,7 +6,7 @@ extern u32 FUN_0200E308(void); extern void FUN_0200E1D0(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 heap_id); extern void MOD05_021E331C(struct FieldSystem *); -THUMB_FUNC BOOL FUN_0204AF24(struct TaskManager *taskManager) +BOOL FUN_0204AF24(struct TaskManager *taskManager) { if(!FUN_0203739C(FUN_02046528(taskManager))) { @@ -15,7 +15,7 @@ THUMB_FUNC BOOL FUN_0204AF24(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204AF3C(struct TaskManager *taskManager) +void FUN_0204AF3C(struct TaskManager *taskManager) { struct FieldSystem * fieldSystem= FUN_02046528(taskManager); if(!FUN_0203739C(fieldSystem)) @@ -27,7 +27,7 @@ THUMB_FUNC void FUN_0204AF3C(struct TaskManager *taskManager) FUN_0204640C(taskManager, &FUN_0204AF24, NULL); } -THUMB_FUNC BOOL FUN_0204AF6C(struct TaskManager *taskManager) +BOOL FUN_0204AF6C(struct TaskManager *taskManager) { if(FUN_020464A4(FUN_02046528(taskManager))) { @@ -36,7 +36,7 @@ THUMB_FUNC BOOL FUN_0204AF6C(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOverworld +void FUN_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOverworld { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); if(FUN_0203739C(fieldSystem)) @@ -48,7 +48,7 @@ THUMB_FUNC void FUN_0204AF84(struct TaskManager *taskManager) //TODO: RestoreOve FUN_0204640C(taskManager, &FUN_0204AF6C, NULL); } -THUMB_FUNC BOOL FUN_0204AFB4(struct TaskManager *taskManager) +BOOL FUN_0204AFB4(struct TaskManager *taskManager) { #pragma unused(taskManager) if(FUN_0200E308()) @@ -58,7 +58,7 @@ THUMB_FUNC BOOL FUN_0204AFB4(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204AFC8(struct TaskManager *taskManager) +void FUN_0204AFC8(struct TaskManager *taskManager) { if(!FUN_0203739C(FUN_02046528(taskManager))) { @@ -69,7 +69,7 @@ THUMB_FUNC void FUN_0204AFC8(struct TaskManager *taskManager) FUN_0204640C(taskManager, &FUN_0204AFB4, 0); } -THUMB_FUNC void FUN_0204B00C(struct TaskManager *taskManager) +void FUN_0204B00C(struct TaskManager *taskManager) { if(!FUN_0203739C(FUN_02046528(taskManager))) { @@ -80,7 +80,7 @@ THUMB_FUNC void FUN_0204B00C(struct TaskManager *taskManager) FUN_0204640C(taskManager, FUN_0204AFB4, 0); } -THUMB_FUNC BOOL FUN_0204B050(struct TaskManager *taskManager) +BOOL FUN_0204B050(struct TaskManager *taskManager) { u32 * r4 = FUN_02046530(taskManager); switch(r4[0]) @@ -101,12 +101,12 @@ THUMB_FUNC BOOL FUN_0204B050(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204B090(struct TaskManager *taskManager) +void FUN_0204B090(struct TaskManager *taskManager) { FUN_0204640C(taskManager, &FUN_0204B050, 0); } -THUMB_FUNC BOOL FUN_0204B0A0(struct TaskManager *taskManager) +BOOL FUN_0204B0A0(struct TaskManager *taskManager) { u32 * r4 = FUN_02046530(taskManager); struct FieldSystem *fieldSystem = FUN_02046528(taskManager); @@ -129,7 +129,7 @@ THUMB_FUNC BOOL FUN_0204B0A0(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0204B0E8(struct TaskManager *taskManager) +void FUN_0204B0E8(struct TaskManager *taskManager) { FUN_0204640C(taskManager, &FUN_0204B0A0, 0); } diff --git a/arm9/src/unk_0204B0A0.c b/arm9/src/unk_0204B0A0.c index 73cfe2ef5..5fd3cf417 100644 --- a/arm9/src/unk_0204B0A0.c +++ b/arm9/src/unk_0204B0A0.c @@ -24,7 +24,7 @@ extern void FUN_0203959C(struct FieldSystem*); extern void FUN_02025A60(struct SaveBlock2* sav2, s32); extern struct SaveBlock2* ScriptEnvironment_GetSavePtr(struct FieldSystem*); -THUMB_FUNC void FUN_0204B0F8(struct FieldSystem *fieldSystem) +void FUN_0204B0F8(struct FieldSystem *fieldSystem) { RTCDate date; RTCTime time; @@ -38,7 +38,7 @@ THUMB_FUNC void FUN_0204B0F8(struct FieldSystem *fieldSystem) } } -THUMB_FUNC void FUN_0204B130(struct FieldSystem *fieldSystem, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date) +void FUN_0204B130(struct FieldSystem *fieldSystem, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date) { u32 days = (u32)RTC_ConvertDateToDay(date); u32 days_since_nitro_epoch = (u32)rtc_info->daysSinceNitroEpoch; @@ -54,7 +54,7 @@ THUMB_FUNC void FUN_0204B130(struct FieldSystem *fieldSystem, struct UnkSaveStru } } -THUMB_FUNC void FUN_0204B158(struct FieldSystem *fieldSystem, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date, struct RTCTime* time) +void FUN_0204B158(struct FieldSystem *fieldSystem, struct UnkSaveStruct_0202376C_sub* rtc_info, struct RTCDate* date, struct RTCTime* time) { s64 unk1 = RTC_ConvertDateTimeToSecond(date, time); s64 unk2 = RTC_ConvertDateTimeToSecond(&rtc_info->date, &rtc_info->time); @@ -77,7 +77,7 @@ THUMB_FUNC void FUN_0204B158(struct FieldSystem *fieldSystem, struct UnkSaveStru } } -THUMB_FUNC void FUN_0204B1DC(struct FieldSystem *fieldSystem, s32 a1) +void FUN_0204B1DC(struct FieldSystem *fieldSystem, s32 a1) { struct SaveBlock2* sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); FUN_02025A60(sav2, a1); @@ -117,7 +117,7 @@ THUMB_FUNC void FUN_0204B1DC(struct FieldSystem *fieldSystem, s32 a1) FUN_02029C08(unk_sav_ptr3); } -THUMB_FUNC void FUN_0204B270(struct FieldSystem *fieldSystem, s32 a1, struct RTCTime* time) +void FUN_0204B270(struct FieldSystem *fieldSystem, s32 a1, struct RTCTime* time) { FUN_0204B3D0(fieldSystem, a1); FUN_0202A9D0(fieldSystem->saveBlock2, a1); @@ -127,70 +127,70 @@ THUMB_FUNC void FUN_0204B270(struct FieldSystem *fieldSystem, s32 a1, struct RTC FUN_0202B3C4(unk_sav_ptr, a1, time->minute); } -THUMB_FUNC u32 Script_GetTimeOfDay(struct FieldSystem *fieldSystem) +u32 Script_GetTimeOfDay(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return GF_RTC_GetTimeOfDayByHour(rtc_info->time.hour); } -THUMB_FUNC u32 Script_GetMonth(struct FieldSystem *fieldSystem) +u32 Script_GetMonth(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return rtc_info->date.month; } -THUMB_FUNC u32 Script_GetDay(struct FieldSystem *fieldSystem) +u32 Script_GetDay(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return rtc_info->date.day; } -THUMB_FUNC RTCWeek Script_GetWeekday(struct FieldSystem *fieldSystem) +RTCWeek Script_GetWeekday(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return rtc_info->date.week; } -THUMB_FUNC u32 Script_GetHour(struct FieldSystem *fieldSystem) +u32 Script_GetHour(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return rtc_info->time.hour; } -THUMB_FUNC u32 Script_GetMinute(struct FieldSystem *fieldSystem) +u32 Script_GetMinute(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); return rtc_info->time.minute; } -THUMB_FUNC void Script_SavRTC_x24toDateTime(struct FieldSystem *fieldSystem, struct RTCDate* date, struct RTCTime* time) +void Script_SavRTC_x24toDateTime(struct FieldSystem *fieldSystem, struct RTCDate* date, struct RTCTime* time) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); RTC_ConvertSecondToDateTime(date, time, rtc_info->secondsSinceNitroEpoch); } -THUMB_FUNC void Script_SavRTC_x2CtoDateTime(struct FieldSystem *fieldSystem, struct RTCDate* date, struct RTCTime* time) +void Script_SavRTC_x2CtoDateTime(struct FieldSystem *fieldSystem, struct RTCDate* date, struct RTCTime* time) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); RTC_ConvertSecondToDateTime(date, time, rtc_info->field_2C); } -THUMB_FUNC void Script_SavRTC_DateTimeTox2C(struct FieldSystem *fieldSystem) +void Script_SavRTC_DateTimeTox2C(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); rtc_info->field_2C = GF_RTC_DateTimeToSec(); } -THUMB_FUNC BOOL FUN_0204B33C(struct FieldSystem *fieldSystem) +BOOL FUN_0204B33C(struct FieldSystem *fieldSystem) { struct UnkSaveStruct_0202376C_sub* rtc_info = Save_SysInfo_RTC_Get(fieldSystem->saveBlock2); diff --git a/arm9/src/unk_0205EC84.c b/arm9/src/unk_0205EC84.c index b20349d52..3b57980a5 100644 --- a/arm9/src/unk_0205EC84.c +++ b/arm9/src/unk_0205EC84.c @@ -4,22 +4,22 @@ #include "constants/sndseq.h" #include "constants/maps.h" -static THUMB_FUNC void _flag_set(struct ScriptState * state, u16 flag_id) +static void _flag_set(struct ScriptState * state, u16 flag_id) { SetFlagInArray(state, flag_id); } -static THUMB_FUNC void _flag_clear(struct ScriptState * state, u16 flag_id) +static void _flag_clear(struct ScriptState * state, u16 flag_id) { ClearFlagInArray(state, flag_id); } -static THUMB_FUNC BOOL _flag_check(struct ScriptState * state, u16 flag_id) +static BOOL _flag_check(struct ScriptState * state, u16 flag_id) { return CheckFlagInArray(state, flag_id); } -static THUMB_FUNC BOOL _flag_op(struct ScriptState * state, u32 op, u32 flag_id) +static BOOL _flag_op(struct ScriptState * state, u32 op, u32 flag_id) { switch (op) { @@ -37,107 +37,107 @@ static THUMB_FUNC BOOL _flag_op(struct ScriptState * state, u32 op, u32 flag_id) return FALSE; } -THUMB_FUNC void FUN_0205ECD4(struct ScriptState * state) +void FUN_0205ECD4(struct ScriptState * state) { _flag_set(state, 0x960); } -THUMB_FUNC BOOL FUN_0205ECE0(struct ScriptState * state) +BOOL FUN_0205ECE0(struct ScriptState * state) { return _flag_check(state, 0x960); } -THUMB_FUNC BOOL FUN_0205ECEC(struct ScriptState * state) +BOOL FUN_0205ECEC(struct ScriptState * state) { return _flag_check(state, 0x98D); } -THUMB_FUNC void FUN_0205ECFC(struct ScriptState * state) +void FUN_0205ECFC(struct ScriptState * state) { _flag_set(state, 0x964); } -THUMB_FUNC BOOL FUN_0205ED0C(struct ScriptState * state) +BOOL FUN_0205ED0C(struct ScriptState * state) { return _flag_check(state, 0x964); } -THUMB_FUNC void FUN_0205ED1C(struct ScriptState * state) +void FUN_0205ED1C(struct ScriptState * state) { _flag_set(state, 0x961); } -THUMB_FUNC void FUN_0205ED2C(struct ScriptState * state) +void FUN_0205ED2C(struct ScriptState * state) { _flag_clear(state, 0x961); } -THUMB_FUNC BOOL FUN_0205ED3C(struct ScriptState * state) +BOOL FUN_0205ED3C(struct ScriptState * state) { return _flag_check(state, 0x961); } -THUMB_FUNC void FUN_0205ED4C(struct ScriptState * state) +void FUN_0205ED4C(struct ScriptState * state) { _flag_set(state, 0x965); } -THUMB_FUNC void FUN_0205ED5C(struct ScriptState * state) +void FUN_0205ED5C(struct ScriptState * state) { _flag_clear(state, 0x965); } -THUMB_FUNC BOOL FUN_0205ED6C(struct ScriptState * state) +BOOL FUN_0205ED6C(struct ScriptState * state) { return _flag_check(state, 0x965); } -THUMB_FUNC void FUN_0205ED7C(struct ScriptState * state) +void FUN_0205ED7C(struct ScriptState * state) { _flag_set(state, 0x96D); } -THUMB_FUNC void FUN_0205ED8C(struct ScriptState * state) +void FUN_0205ED8C(struct ScriptState * state) { _flag_clear(state, 0x96D); } -THUMB_FUNC BOOL FUN_0205ED9C(struct ScriptState * state) +BOOL FUN_0205ED9C(struct ScriptState * state) { return _flag_check(state, 0x96D); } -THUMB_FUNC void FUN_0205EDAC(struct ScriptState * state) +void FUN_0205EDAC(struct ScriptState * state) { _flag_set(state, 0x96E); } -THUMB_FUNC void FUN_0205EDBC(struct ScriptState * state) +void FUN_0205EDBC(struct ScriptState * state) { _flag_set(state, 0x96F); } -THUMB_FUNC void FUN_0205EDCC(struct ScriptState * state) +void FUN_0205EDCC(struct ScriptState * state) { _flag_set(state, 0x970); } -THUMB_FUNC void FUN_0205EDD8(struct ScriptState * state) +void FUN_0205EDD8(struct ScriptState * state) { _flag_set(state, 0x971); } -THUMB_FUNC void FUN_0205EDE8(struct ScriptState * state) +void FUN_0205EDE8(struct ScriptState * state) { _flag_set(state, 0x972); } -THUMB_FUNC void FUN_0205EDF8(struct ScriptState * state) +void FUN_0205EDF8(struct ScriptState * state) { _flag_set(state, 0x973); } -THUMB_FUNC void FUN_0205EE08(struct ScriptState * state, u32 a1) +void FUN_0205EE08(struct ScriptState * state, u32 a1) { switch (a1) { @@ -159,7 +159,7 @@ THUMB_FUNC void FUN_0205EE08(struct ScriptState * state, u32 a1) } } -THUMB_FUNC BOOL FUN_0205EE60(struct ScriptState * state, u32 a1) +BOOL FUN_0205EE60(struct ScriptState * state, u32 a1) { switch (a1) { @@ -177,7 +177,7 @@ THUMB_FUNC BOOL FUN_0205EE60(struct ScriptState * state, u32 a1) // UB: No return value } -THUMB_FUNC BOOL FUN_0205EEB8(struct ScriptState * state, u32 a1) +BOOL FUN_0205EEB8(struct ScriptState * state, u32 a1) { BOOL ret = FALSE; switch (a1) @@ -203,7 +203,7 @@ THUMB_FUNC BOOL FUN_0205EEB8(struct ScriptState * state, u32 a1) return ret; } -THUMB_FUNC s32 FUN_0205EF20(struct ScriptState * state, s32 a1) +s32 FUN_0205EF20(struct ScriptState * state, s32 a1) { s32 ret = 0; switch (a1) @@ -301,138 +301,138 @@ THUMB_FUNC s32 FUN_0205EF20(struct ScriptState * state, s32 a1) } -THUMB_FUNC void FUN_0205F154(struct ScriptState * state) +void FUN_0205F154(struct ScriptState * state) { _flag_set(state, 0x966); } -THUMB_FUNC void FUN_0205F164(struct ScriptState * state) +void FUN_0205F164(struct ScriptState * state) { _flag_clear(state, 0x966); } -THUMB_FUNC BOOL FUN_0205F174(struct ScriptState * state) +BOOL FUN_0205F174(struct ScriptState * state) { return _flag_check(state, 0x966); } -THUMB_FUNC BOOL FUN_0205F184(struct ScriptState * state) +BOOL FUN_0205F184(struct ScriptState * state) { return _flag_check(state, 0x978); } -THUMB_FUNC BOOL FUN_0205F194(struct ScriptState * state) +BOOL FUN_0205F194(struct ScriptState * state) { return _flag_check(state, 0x992); } -THUMB_FUNC BOOL FUN_0205F1A4(struct ScriptState * state) +BOOL FUN_0205F1A4(struct ScriptState * state) { return _flag_check(state, 0x97D); } -THUMB_FUNC BOOL FUN_0205F1B4(struct ScriptState * state) +BOOL FUN_0205F1B4(struct ScriptState * state) { return _flag_check(state, 0x97E); } -THUMB_FUNC void FUN_0205F1C4(struct ScriptState * state) +void FUN_0205F1C4(struct ScriptState * state) { _flag_set(state, 0x97C); } -THUMB_FUNC void FUN_0205F1D4(struct ScriptState * state) +void FUN_0205F1D4(struct ScriptState * state) { _flag_clear(state, 0x97C); } -THUMB_FUNC BOOL FUN_0205F1E4(struct ScriptState * state) +BOOL FUN_0205F1E4(struct ScriptState * state) { return _flag_check(state, 0x97C); } -THUMB_FUNC void FUN_0205F1F4(struct ScriptState * state) +void FUN_0205F1F4(struct ScriptState * state) { _flag_set(state, 0x967); } -THUMB_FUNC void FUN_0205F204(struct ScriptState * state) +void FUN_0205F204(struct ScriptState * state) { _flag_clear(state, 0x967); } -THUMB_FUNC BOOL FUN_0205F214(struct ScriptState * state) +BOOL FUN_0205F214(struct ScriptState * state) { return _flag_check(state, 0x967); } -THUMB_FUNC void FUN_0205F224(struct ScriptState * state) +void FUN_0205F224(struct ScriptState * state) { _flag_set(state, 0x979); } -THUMB_FUNC void FUN_0205F234(struct ScriptState * state) +void FUN_0205F234(struct ScriptState * state) { _flag_clear(state, 0x979); } -THUMB_FUNC BOOL FUN_0205F244(struct ScriptState * state) +BOOL FUN_0205F244(struct ScriptState * state) { return _flag_check(state, 0x979); } -THUMB_FUNC void FUN_0205F254(struct ScriptState * state) +void FUN_0205F254(struct ScriptState * state) { _flag_clear(state, 0x994); } -THUMB_FUNC BOOL FUN_0205F264(struct ScriptState * state, u32 op) +BOOL FUN_0205F264(struct ScriptState * state, u32 op) { return _flag_op(state, op, 0x962); } -THUMB_FUNC void FUN_0205F274(struct ScriptState * state) +void FUN_0205F274(struct ScriptState * state) { _flag_set(state, 0x97A); } -THUMB_FUNC void FUN_0205F284(struct ScriptState * state) +void FUN_0205F284(struct ScriptState * state) { _flag_clear(state, 0x97A); } -THUMB_FUNC BOOL FUN_0205F294(struct ScriptState * state) +BOOL FUN_0205F294(struct ScriptState * state) { return _flag_check(state, 0x97A); } -THUMB_FUNC void FUN_0205F2A4(struct ScriptState * state) +void FUN_0205F2A4(struct ScriptState * state) { _flag_set(state, 0x97B); } -THUMB_FUNC void FUN_0205F2B4(struct ScriptState * state) +void FUN_0205F2B4(struct ScriptState * state) { _flag_clear(state, 0x97B); } -THUMB_FUNC BOOL FUN_0205F2C4(struct ScriptState * state) +BOOL FUN_0205F2C4(struct ScriptState * state) { return _flag_check(state, 0x97B); } -THUMB_FUNC BOOL FUN_0205F2D4(struct ScriptState * state, u32 op) +BOOL FUN_0205F2D4(struct ScriptState * state, u32 op) { return _flag_op(state, op, 0x963); } -THUMB_FUNC BOOL FUN_0205F2E4(struct ScriptState * state, u32 op, u16 flag_id) +BOOL FUN_0205F2E4(struct ScriptState * state, u32 op, u16 flag_id) { GF_ASSERT(flag_id < 69); return _flag_op(state, op, 0x9B0 + flag_id); } -THUMB_FUNC void FUN_0205F304(struct ScriptState * state) +void FUN_0205F304(struct ScriptState * state) { _flag_set(state, 0x98C); } diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c index d2e1c27dd..b191393a9 100644 --- a/arm9/src/unk_0205FA2C.c +++ b/arm9/src/unk_0205FA2C.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_0205FA2C.h" #include "unk_020337E8.h" #include "unk_0202A1E0.h" @@ -28,7 +29,7 @@ const u8 UNK_020F7454[] = { 0x08, }; -THUMB_FUNC u32 FUN_0205FA2C( +u32 FUN_0205FA2C( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, u32 heap_id) { struct UnkPlayerStruct1_0205FA2C *ptr = (struct UnkPlayerStruct1_0205FA2C *)AllocFromHeapAtEnd( @@ -62,7 +63,7 @@ THUMB_FUNC u32 FUN_0205FA2C( return 1; } -THUMB_FUNC u32 FUN_0205FAD8( +u32 FUN_0205FAD8( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem) { if (FUN_0204647C(fieldSystem)) @@ -97,7 +98,7 @@ THUMB_FUNC u32 FUN_0205FAD8( return 2; } -THUMB_FUNC u32 FUN_0205FB34( +u32 FUN_0205FB34( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem, u32 heap_id) { struct SaveBlock2 *sav2 = fieldSystem->saveBlock2; @@ -132,7 +133,7 @@ THUMB_FUNC u32 FUN_0205FB34( return 3; } -THUMB_FUNC u32 FUN_0205FBC0( +u32 FUN_0205FBC0( struct UnkCallbackStruct1_0205FA2C *param0, struct FieldSystem *fieldSystem) { if (FUN_0204647C(fieldSystem)) @@ -149,7 +150,7 @@ THUMB_FUNC u32 FUN_0205FBC0( return 0; } -THUMB_FUNC BOOL FUN_0205FBE8(struct TaskManager *taskManager) +BOOL FUN_0205FBE8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); struct UnkCallbackStruct1_0205FA2C *res2 = @@ -176,7 +177,7 @@ THUMB_FUNC BOOL FUN_0205FBE8(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0205FC50(struct TaskManager *taskManager, +void FUN_0205FC50(struct TaskManager *taskManager, void **param1, u8 param2, u8 param3, @@ -202,7 +203,7 @@ THUMB_FUNC void FUN_0205FC50(struct TaskManager *taskManager, FUN_0204640C(fieldSystem->taskManager, &FUN_0205FBE8, ptr); } -THUMB_FUNC u32 FUN_0205FC9C( +u32 FUN_0205FC9C( struct UnkCallbackStruct2_0205FA2C *param0, struct FieldSystem *fieldSystem) { if (FUN_0203384C(fieldSystem->saveBlock2)) @@ -216,7 +217,7 @@ THUMB_FUNC u32 FUN_0205FC9C( return 2; } -THUMB_FUNC u32 FUN_0205FCC4( +u32 FUN_0205FCC4( struct UnkCallbackStruct2_0205FA2C *param0, struct FieldSystem *fieldSystem) { if (FUN_0204647C(fieldSystem)) @@ -230,7 +231,7 @@ THUMB_FUNC u32 FUN_0205FCC4( return 2; } -THUMB_FUNC BOOL FUN_0205FCE8(struct TaskManager *taskManager) +BOOL FUN_0205FCE8(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); struct UnkCallbackStruct2_0205FA2C *res2 = @@ -255,7 +256,7 @@ THUMB_FUNC BOOL FUN_0205FCE8(struct TaskManager *taskManager) return FALSE; } -THUMB_FUNC void FUN_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 param3) +void FUN_0205FD38(struct TaskManager *taskManager, u16 param1, u16 param2, u16 param3) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); struct UnkCallbackStruct2_0205FA2C *ptr = (struct UnkCallbackStruct2_0205FA2C *)AllocFromHeap( @@ -269,7 +270,7 @@ THUMB_FUNC void FUN_0205FD38(struct TaskManager *taskManager, u16 param1, u16 pa FUN_0204640C(fieldSystem->taskManager, &FUN_0205FCE8, (u32 *)ptr); } -THUMB_FUNC BOOL FUN_0205FD70(struct TaskManager *taskManager) +BOOL FUN_0205FD70(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); u16 *res2 = (u16 *)FUN_0204652C(taskManager); @@ -298,7 +299,7 @@ THUMB_FUNC BOOL FUN_0205FD70(struct TaskManager *taskManager) return TRUE; } -THUMB_FUNC void FUN_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2) +void FUN_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 param2) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); @@ -311,7 +312,7 @@ THUMB_FUNC void FUN_0205FDDC(struct TaskManager *taskManager, u16 param1, u16 pa FUN_0204640C(fieldSystem->taskManager, &FUN_0205FD70, (u32 *)ptr); } -THUMB_FUNC u32 FUN_0205FE10(struct SaveBlock2 *sav2) +u32 FUN_0205FE10(struct SaveBlock2 *sav2) { u16 res = (u16) GameStats_GetCapped(Save_GameStats_Get(sav2), 0x35); @@ -392,7 +393,7 @@ THUMB_FUNC u32 FUN_0205FE10(struct SaveBlock2 *sav2) return 4; } -THUMB_FUNC u32 FUN_0205FF5C(struct SaveBlock2 *sav2) +u32 FUN_0205FF5C(struct SaveBlock2 *sav2) { u16 res = (u16) GameStats_GetCapped(Save_GameStats_Get(sav2), 0x35); if (res < 20) @@ -458,7 +459,7 @@ THUMB_FUNC u32 FUN_0205FF5C(struct SaveBlock2 *sav2) return 3; } -THUMB_FUNC void FUN_02060044(u16 **param0, u32 *param1) +void FUN_02060044(u16 **param0, u32 *param1) { u16 *ptr = param0[42]; @@ -467,17 +468,17 @@ THUMB_FUNC void FUN_02060044(u16 **param0, u32 *param1) ptr[19] += param1[2]; } -THUMB_FUNC u32 FUN_02060064(u32 param0) +u32 FUN_02060064(u32 param0) { return param0 * 0x02E90EDD + 1; } -THUMB_FUNC u32 FUN_02060070(u32 param0) +u32 FUN_02060070(u32 param0) { return param0 * 0x5D588B65 + 1; } -THUMB_FUNC u32 FUN_0206007C(struct SaveBlock2 *sav2) +u32 FUN_0206007C(struct SaveBlock2 *sav2) { u32 res = FUN_02060070(FUN_020287A4(FUN_0202881C(sav2))); @@ -486,7 +487,7 @@ THUMB_FUNC u32 FUN_0206007C(struct SaveBlock2 *sav2) return res; } -THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2) +u32 FUN_020600A0(struct SaveBlock2 *sav2) { struct SaveStruct23_Substruct2 *saveStruct23_substruct2 = SaveStruct23_GetSubstruct2(sav2); @@ -500,7 +501,7 @@ THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2) return res3; } -THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2) +u32 FUN_020600DC(struct SaveBlock2 *sav2) { struct SaveStruct23_Substruct2 *saveStruct23_substruct2 = SaveStruct23_GetSubstruct2(sav2); @@ -521,7 +522,7 @@ THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2) return res3; } -THUMB_FUNC BOOL FUN_02060144(u32 **param0) +BOOL FUN_02060144(u32 **param0) { if (param0[7][0] == SPECIES_ARCEUS) { diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c index 89392284b..62e30d695 100644 --- a/arm9/src/unk_0206015C.c +++ b/arm9/src/unk_0206015C.c @@ -1,3 +1,4 @@ +#include "global.h" #include "unk_0206015C.h" #include "constants/sndseq.h" @@ -32,7 +33,7 @@ extern void FUN_0205F1C4(struct ScriptState *); extern void FUN_0205F1D4(struct ScriptState *); extern void FUN_0206367C(struct FieldSystem *, u32); -THUMB_FUNC void FUN_0206015C(struct FieldSystem *fieldSystem) +void FUN_0206015C(struct FieldSystem *fieldSystem) { struct UnkStruct_0206015C *unkStruct = AllocFromHeapAtEnd(0xb, 0x10); unkStruct->unk0 = MOD06_02244DB0(0xb); @@ -43,7 +44,7 @@ THUMB_FUNC void FUN_0206015C(struct FieldSystem *fieldSystem) FUN_0204640C(fieldSystem->taskManager, FUN_02060194, (u32 *)unkStruct); } -THUMB_FUNC BOOL FUN_02060194(struct TaskManager *taskManager) +BOOL FUN_02060194(struct TaskManager *taskManager) { struct FieldSystem *fieldSystem = FUN_02046528(taskManager); struct UnkStruct_0204652C *unkStruct1 = (struct UnkStruct_0204652C *)FUN_0204652C(taskManager); diff --git a/arm9/src/unk_0206439C.c b/arm9/src/unk_0206439C.c index af802badf..8da4bf912 100644 --- a/arm9/src/unk_0206439C.c +++ b/arm9/src/unk_0206439C.c @@ -4,7 +4,7 @@ #include "save_block_2.h" #include "unk_0206439C.h" -THUMB_FUNC struct UnkStruct_0206439C* FUN_0206439C(u32 heap_id, u8 mon_idx, struct SaveBlock2* sav2) +struct UnkStruct_0206439C* FUN_0206439C(u32 heap_id, u8 mon_idx, struct SaveBlock2* sav2) { struct UnkStruct_0206439C* ret = AllocFromHeapAtEnd(heap_id, sizeof(struct UnkStruct_0206439C)); struct PlayerParty* party = SaveArray_PlayerParty_Get(sav2); diff --git a/arm9/src/unk_02064E20.c b/arm9/src/unk_02064E20.c index b45718fef..1bbfd6396 100644 --- a/arm9/src/unk_02064E20.c +++ b/arm9/src/unk_02064E20.c @@ -4,7 +4,7 @@ #include "unk_02024E64.h" #include "unk_02064E20.h" -THUMB_FUNC void FUN_02064E20(struct FieldSystem* fieldSystem) +void FUN_02064E20(struct FieldSystem* fieldSystem) { struct unk_2025484 * r4 = (struct unk_2025484 *)FUN_02024ED8(ScriptEnvironment_GetSavePtr(fieldSystem)); if((u32)FUN_020254B4(r4) == 6) diff --git a/arm9/src/unk_02064E4C.c b/arm9/src/unk_02064E4C.c index e101800ec..960d15bbc 100644 --- a/arm9/src/unk_02064E4C.c +++ b/arm9/src/unk_02064E4C.c @@ -3,9 +3,6 @@ #include "unk_02064E4C.h" #include "font.h" -#pragma thumb on - - void FUN_02064E4C(struct MsgData * msgData, u16 map_sec, struct String * dest) { ReadMsgDataIntoString(msgData, map_sec, dest); diff --git a/arm9/src/unk_0206B688.c b/arm9/src/unk_0206B688.c index 465fa8424..397fa668d 100644 --- a/arm9/src/unk_0206B688.c +++ b/arm9/src/unk_0206B688.c @@ -2,8 +2,6 @@ #include "pokemon.h" #include "unk_0206B688.h" -#pragma thumb on - u16 BoxMon_GetAlternateForme(struct BoxPokemon * boxmon); u32 FUN_0206B6D4(u32 species, u32 is_egg, u32 forme); diff --git a/arm9/src/unk_0206BB28.c b/arm9/src/unk_0206BB28.c index abf962318..b7ff0bac6 100644 --- a/arm9/src/unk_0206BB28.c +++ b/arm9/src/unk_0206BB28.c @@ -4,8 +4,6 @@ #include "pokemon.h" #include "unk_0206BB28.h" -#pragma thumb on - BOOL SaveArray_IsNatDexEnabled(struct SaveBlock2 * sav2) { return Pokedex_IsNatDexEnabled(Save_Pokedex_Get(sav2)); diff --git a/arm9/src/unk_0207FC5C.c b/arm9/src/unk_0207FC5C.c index 1f001de11..36f73dc3e 100644 --- a/arm9/src/unk_0207FC5C.c +++ b/arm9/src/unk_0207FC5C.c @@ -2,8 +2,6 @@ #include "unk_0207FC5C.h" #include "constants/pokemon.h" -#pragma thumb on - struct UnkStruct_020FB788 { u32 monDataId; diff --git a/arm9/src/unk_020851B8.c b/arm9/src/unk_020851B8.c index 922ca2e4e..cf4fa68ab 100644 --- a/arm9/src/unk_020851B8.c +++ b/arm9/src/unk_020851B8.c @@ -3,14 +3,14 @@ #include "constants/items.h" #include "heap.h" -THUMB_FUNC struct UnkStruct_020851B8 *FUN_020851B8(u32 heap_id) +struct UnkStruct_020851B8 *FUN_020851B8(u32 heap_id) { struct UnkStruct_020851B8 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_020851B8)); __builtin__clear(ptr, sizeof(struct UnkStruct_020851B8)); return ptr; } -THUMB_FUNC void FUN_020851DC(struct UnkStruct_020851B8 *param0, u16 item_id, BOOL param2) +void FUN_020851DC(struct UnkStruct_020851B8 *param0, u16 item_id, BOOL param2) { u16 berry_id = item_id - FIRST_BERRY_IDX; FUN_02085200(param0, berry_id); @@ -21,24 +21,24 @@ THUMB_FUNC void FUN_020851DC(struct UnkStruct_020851B8 *param0, u16 item_id, BOO } } -THUMB_FUNC void FUN_020851F8(struct UnkStruct_020851B8 *param0, u8 param1, u8 param2, u8 param3) +void FUN_020851F8(struct UnkStruct_020851B8 *param0, u8 param1, u8 param2, u8 param3) { param0->unk_9 = param1; param0->unk_A = param2; param0->unk_B = param3; } -THUMB_FUNC void FUN_02085200(struct UnkStruct_020851B8 *param0, u16 berry_id) +void FUN_02085200(struct UnkStruct_020851B8 *param0, u16 berry_id) { param0->flags[berry_id / 32] |= 1 << (berry_id % 32); } -THUMB_FUNC u8 FUN_02085224(struct UnkStruct_020851B8 *param0, u16 berry_id) +u8 FUN_02085224(struct UnkStruct_020851B8 *param0, u16 berry_id) { return param0->flags[berry_id / 32] & (1 << (berry_id % 32)) ? 1 : 0; } -THUMB_FUNC void FUN_0208524C(struct UnkStruct_020851B8 *param0, u8 *param1, u8 *param2) +void FUN_0208524C(struct UnkStruct_020851B8 *param0, u8 *param1, u8 *param2) { *param1 = param0->unk_9; *param2 = param0->unk_A; diff --git a/arm9/src/unk_02085338.c b/arm9/src/unk_02085338.c index 37fa41a60..4d8f7c7c5 100644 --- a/arm9/src/unk_02085338.c +++ b/arm9/src/unk_02085338.c @@ -5,7 +5,7 @@ extern BOOL FUN_0205ED0C(struct ScriptState * state); -THUMB_FUNC struct UnkStruct_02085338 * FUN_02085338(u8 r5, u8 r7, struct SaveBlock2 * sav2, u32 heap_id) +struct UnkStruct_02085338 * FUN_02085338(u8 r5, u8 r7, struct SaveBlock2 * sav2, u32 heap_id) { struct UnkStruct_02085338 * ret = (struct UnkStruct_02085338 *) AllocFromHeap(heap_id, sizeof(struct UnkStruct_02085338)); ret->unk_00 = r5; @@ -31,100 +31,100 @@ THUMB_FUNC struct UnkStruct_02085338 * FUN_02085338(u8 r5, u8 r7, struct SaveBlo return ret; } -THUMB_FUNC void FUN_020853A8(struct UnkStruct_02085338 * ptr) +void FUN_020853A8(struct UnkStruct_02085338 * ptr) { FreeToHeap(ptr); } -THUMB_FUNC void FUN_020853B0(struct UnkStruct_02085338 * ptr, u16 a1) +void FUN_020853B0(struct UnkStruct_02085338 * ptr, u16 a1) { ptr->unk_1c[0] = a1; } -THUMB_FUNC void FUN_020853B4(struct UnkStruct_02085338 * ptr, u16 a1, u16 a2) +void FUN_020853B4(struct UnkStruct_02085338 * ptr, u16 a1, u16 a2) { ptr->unk_1c[0] = a1; ptr->unk_1c[1] = a2; } -THUMB_FUNC void FUN_020853BC(struct UnkStruct_02085338 * ptr, const struct MailMessage * a1) +void FUN_020853BC(struct UnkStruct_02085338 * ptr, const struct MailMessage * a1) { ptr->unk_14 = *a1; } -THUMB_FUNC void FUN_020853D0(struct UnkStruct_02085338 * ptr) +void FUN_020853D0(struct UnkStruct_02085338 * ptr) { ptr->unk_02 = 1; ptr->unk_03 = 0; } -THUMB_FUNC void FUN_020853DC(struct UnkStruct_02085338 * ptr) +void FUN_020853DC(struct UnkStruct_02085338 * ptr) { ptr->unk_05 = 1; } -THUMB_FUNC u8 FUN_020853E4(struct UnkStruct_02085338 * ptr) +u8 FUN_020853E4(struct UnkStruct_02085338 * ptr) { return ptr->unk_02; } -THUMB_FUNC u8 FUN_020853E8(struct UnkStruct_02085338 * ptr) +u8 FUN_020853E8(struct UnkStruct_02085338 * ptr) { return ptr->unk_03; } -THUMB_FUNC u16 FUN_020853EC(struct UnkStruct_02085338 * ptr) +u16 FUN_020853EC(struct UnkStruct_02085338 * ptr) { return ptr->unk_1c[0]; } -THUMB_FUNC void FUN_020853F0(struct UnkStruct_02085338 * ptr, u16 * a1) +void FUN_020853F0(struct UnkStruct_02085338 * ptr, u16 * a1) { a1[0] = ptr->unk_1c[0]; a1[1] = ptr->unk_1c[1]; } -THUMB_FUNC void FUN_020853FC(struct UnkStruct_02085338 * ptr, struct MailMessage * a1) +void FUN_020853FC(struct UnkStruct_02085338 * ptr, struct MailMessage * a1) { return MailMsg_Copy(a1, &ptr->unk_14); } -THUMB_FUNC u8 FUN_0208540C(struct UnkStruct_02085338 * ptr) +u8 FUN_0208540C(struct UnkStruct_02085338 * ptr) { return ptr->unk_00; } -THUMB_FUNC u8 FUN_02085410(struct UnkStruct_02085338 * ptr) +u8 FUN_02085410(struct UnkStruct_02085338 * ptr) { return ptr->unk_01; } -THUMB_FUNC u32 FUN_02085414(struct UnkStruct_02085338 * ptr) +u32 FUN_02085414(struct UnkStruct_02085338 * ptr) { return ptr->unk_08; } -THUMB_FUNC struct Pokedex * FUN_02085418(struct UnkStruct_02085338 * ptr) +struct Pokedex * FUN_02085418(struct UnkStruct_02085338 * ptr) { return ptr->unk_0c; } -THUMB_FUNC struct UnkStruct_02013B28 * FUN_0208541C(struct UnkStruct_02085338 * ptr) +struct UnkStruct_02013B28 * FUN_0208541C(struct UnkStruct_02085338 * ptr) { return ptr->unk_10; } -THUMB_FUNC u8 FUN_02085420(struct UnkStruct_02085338 * ptr) +u8 FUN_02085420(struct UnkStruct_02085338 * ptr) { return ptr->unk_04; } -THUMB_FUNC u8 FUN_02085424(struct UnkStruct_02085338 * ptr) +u8 FUN_02085424(struct UnkStruct_02085338 * ptr) { return ptr->unk_05; } -THUMB_FUNC void FUN_02085428(struct UnkStruct_02085338 * ptr, u16 * a1, struct MailMessage * a2) +void FUN_02085428(struct UnkStruct_02085338 * ptr, u16 * a1, struct MailMessage * a2) { switch (ptr->unk_00) { @@ -141,7 +141,7 @@ THUMB_FUNC void FUN_02085428(struct UnkStruct_02085338 * ptr, u16 * a1, struct M } } -THUMB_FUNC BOOL FUN_0208545C(struct UnkStruct_02085338 * ptr, const u16 * a1, const struct MailMessage * a2) +BOOL FUN_0208545C(struct UnkStruct_02085338 * ptr, const u16 * a1, const struct MailMessage * a2) { switch (ptr->unk_00) { @@ -155,7 +155,7 @@ THUMB_FUNC BOOL FUN_0208545C(struct UnkStruct_02085338 * ptr, const u16 * a1, co } } -THUMB_FUNC void FUN_020854A0(struct UnkStruct_02085338 * r5, u16 * r4, struct MailMessage * r6) +void FUN_020854A0(struct UnkStruct_02085338 * r5, u16 * r4, struct MailMessage * r6) { r5->unk_03 = (u8)(!FUN_0208545C(r5, r4, r6) ? 1 : 0); r5->unk_02 = 0; diff --git a/arm9/src/unk_02087A1C.c b/arm9/src/unk_02087A1C.c index f20707ada..1c55c8f06 100644 --- a/arm9/src/unk_02087A1C.c +++ b/arm9/src/unk_02087A1C.c @@ -2,8 +2,6 @@ #include "constants/species.h" #include "unk_02087A1C.h" -#pragma thumb on - struct MeisterRodata { u16 species[14]; diff --git a/arm9/src/unk_0208890C.c b/arm9/src/unk_0208890C.c index b742685a4..de4b1c978 100644 --- a/arm9/src/unk_0208890C.c +++ b/arm9/src/unk_0208890C.c @@ -21,7 +21,7 @@ const struct OverlayManagerTemplate UNK_020FD6E4 = { SDK_OVERLAY_INVALID_ID, }; -THUMB_FUNC struct UnkStruct_0208890C* FUN_0208890C(void* a0, struct SaveBlock2* sav2, u32 heap_id, void* a3) +struct UnkStruct_0208890C* FUN_0208890C(void* a0, struct SaveBlock2* sav2, u32 heap_id, void* a3) { struct UnkStruct_0208890C* ret = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0208890C)); MI_CpuFill8(ret, 0, sizeof(struct UnkStruct_0208890C)); @@ -37,12 +37,12 @@ THUMB_FUNC struct UnkStruct_0208890C* FUN_0208890C(void* a0, struct SaveBlock2* return ret; } -THUMB_FUNC void FUN_02088950(struct FieldSystem *fieldSystem, struct UnkStruct_0208890C *param1) +void FUN_02088950(struct FieldSystem *fieldSystem, struct UnkStruct_0208890C *param1) { FUN_020373D4(fieldSystem, (struct OverlayManagerTemplate *)&UNK_020FD6E4, param1); } -THUMB_FUNC struct UnkStruct_0208890C* FUN_02088960(struct FieldSystem *fieldSystem, void* a1, u32 heap_id) +struct UnkStruct_0208890C* FUN_02088960(struct FieldSystem *fieldSystem, void* a1, u32 heap_id) { struct SaveBlock2* sav2 = ScriptEnvironment_GetSavePtr(fieldSystem); struct UnkStruct_0208890C* ret = FUN_0208890C(a1, sav2, heap_id, fieldSystem->unk98); diff --git a/arm9/src/unk_02088AAC.c b/arm9/src/unk_02088AAC.c index bc01016c8..53ba884a3 100644 --- a/arm9/src/unk_02088AAC.c +++ b/arm9/src/unk_02088AAC.c @@ -16,7 +16,7 @@ extern BOOL MOD75_021E6F00(struct OverlayManager *, u32 *); extern BOOL FUN_0208898C(struct OverlayManager **r0); -THUMB_FUNC u32 FUN_02088AAC(struct UnkStruct_02088AAC *r0, u32 *r1) +u32 FUN_02088AAC(struct UnkStruct_02088AAC *r0, u32 *r1) { switch (*r1) { @@ -41,7 +41,7 @@ THUMB_FUNC u32 FUN_02088AAC(struct UnkStruct_02088AAC *r0, u32 *r1) return 0; } -THUMB_FUNC u32 FUN_02088AFC(struct UnkStruct_02088AAC *r0) +u32 FUN_02088AFC(struct UnkStruct_02088AAC *r0) { FS_EXTERN_OVERLAY(MODULE_73); @@ -57,7 +57,7 @@ THUMB_FUNC u32 FUN_02088AFC(struct UnkStruct_02088AAC *r0) return 2; } -THUMB_FUNC u32 FUN_02088B28(struct UnkStruct_02088AAC *r0) +u32 FUN_02088B28(struct UnkStruct_02088AAC *r0) { if (!FUN_0208898C(&r0->ovly_data)) { @@ -72,12 +72,12 @@ THUMB_FUNC u32 FUN_02088B28(struct UnkStruct_02088AAC *r0) return 3; } -THUMB_FUNC u32 FUN_02088B48() +u32 FUN_02088B48() { return 4; } -THUMB_FUNC u32 FUN_02088B4C(struct UnkStruct_02088AAC *r0) +u32 FUN_02088B4C(struct UnkStruct_02088AAC *r0) { FS_EXTERN_OVERLAY(MODULE_75); @@ -99,7 +99,7 @@ THUMB_FUNC u32 FUN_02088B4C(struct UnkStruct_02088AAC *r0) return 1; } -THUMB_FUNC u32 FUN_02088BA8(struct UnkStruct_02088AAC *r0) +u32 FUN_02088BA8(struct UnkStruct_02088AAC *r0) { if (!FUN_0208898C(&r0->ovly_data)) { @@ -134,7 +134,7 @@ THUMB_FUNC u32 FUN_02088BA8(struct UnkStruct_02088AAC *r0) } } -THUMB_FUNC u32 FUN_02088C3C(struct UnkStruct_02088AAC *r0) +u32 FUN_02088C3C(struct UnkStruct_02088AAC *r0) { FS_EXTERN_OVERLAY(MODULE_68); @@ -174,7 +174,7 @@ THUMB_FUNC u32 FUN_02088C3C(struct UnkStruct_02088AAC *r0) return 3; } -THUMB_FUNC u32 FUN_02088CDC(struct UnkStruct_02088AAC *r0) +u32 FUN_02088CDC(struct UnkStruct_02088AAC *r0) { if (!FUN_0208898C(&r0->ovly_data)) { diff --git a/arm9/src/unk_02088DD8.c b/arm9/src/unk_02088DD8.c index b2e9e1036..807868d5a 100644 --- a/arm9/src/unk_02088DD8.c +++ b/arm9/src/unk_02088DD8.c @@ -5,13 +5,13 @@ extern void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); -THUMB_FUNC MoveRelearner *FUN_02088DD8(u32 heap_id) { +MoveRelearner *FUN_02088DD8(u32 heap_id) { MoveRelearner *returnPointer = AllocFromHeap(heap_id, sizeof(MoveRelearner)); __builtin__clear(returnPointer, sizeof(MoveRelearner)); return returnPointer; } -THUMB_FUNC void FUN_02088DF0(MoveRelearner *moveRelearner) { +void FUN_02088DF0(MoveRelearner *moveRelearner) { FreeToHeap(moveRelearner); } @@ -24,7 +24,7 @@ THUMB_FUNC void FUN_02088DF0(MoveRelearner *moveRelearner) { #define WOTBL_LVL(x) (/*(u8)*/(((x) & WOTBL_LVL_MASK) >> WOTBL_LVL_SHIFT)) // i don't know why either. -THUMB_FUNC u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { +u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, 0); u8 forme = (u8)GetMonData(pokemon, MON_DATA_FORME, 0); u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, 0); @@ -71,6 +71,6 @@ THUMB_FUNC u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { return returnTable; } -THUMB_FUNC BOOL FUN_02088EF8(u16 *r0) { +BOOL FUN_02088EF8(u16 *r0) { return *r0 != 0xFFFF; } diff --git a/arm9/src/unk_0208A300.c b/arm9/src/unk_0208A300.c index 3c4a496b7..ed1cd1b48 100644 --- a/arm9/src/unk_0208A300.c +++ b/arm9/src/unk_0208A300.c @@ -2,7 +2,7 @@ #include "heap.h" #include "unk_0208A300.h" -THUMB_FUNC struct UnkStruct_0208A300* FUN_0208A300(u32 heap_id) +struct UnkStruct_0208A300* FUN_0208A300(u32 heap_id) { struct UnkStruct_0208A300* ret = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0208A300)); @@ -12,27 +12,27 @@ THUMB_FUNC struct UnkStruct_0208A300* FUN_0208A300(u32 heap_id) return ret; } -THUMB_FUNC void FUN_0208A320(struct UnkStruct_0208A300* unk) +void FUN_0208A320(struct UnkStruct_0208A300* unk) { FreeToHeap(unk); } -THUMB_FUNC u32 FUN_0208A328(struct UnkStruct_0208A300* unk) +u32 FUN_0208A328(struct UnkStruct_0208A300* unk) { return unk->unk0; } -THUMB_FUNC void FUN_0208A32C(struct UnkStruct_0208A300* unk, u32 a1) +void FUN_0208A32C(struct UnkStruct_0208A300* unk, u32 a1) { unk->unk0 = a1; } -THUMB_FUNC u32 FUN_0208A330(struct UnkStruct_0208A300* unk) +u32 FUN_0208A330(struct UnkStruct_0208A300* unk) { return unk->unk4; } -THUMB_FUNC void FUN_0208A334(struct UnkStruct_0208A300* unk, u32 a1) +void FUN_0208A334(struct UnkStruct_0208A300* unk, u32 a1) { unk->unk4 = a1; } diff --git a/arm9/src/use_item_on_mon.c b/arm9/src/use_item_on_mon.c index 9e11e4bfb..e712b2e89 100644 --- a/arm9/src/use_item_on_mon.c +++ b/arm9/src/use_item_on_mon.c @@ -7,8 +7,6 @@ #include "use_item_on_mon.h" #include "constants/moves.h" -#pragma thumb on - BOOL CanUseItemOnPokemon(struct Pokemon * pokemon, u16 itemId, s32 moveId, u32 heap_id) { s32 atkEv; diff --git a/arm9/src/waza.c b/arm9/src/waza.c index 5d676afae..8dfb620dc 100644 --- a/arm9/src/waza.c +++ b/arm9/src/waza.c @@ -1,10 +1,10 @@ +// TODO: RENAME FILE - WE SHOULD NOT BE USING WAZA + #include "global.h" #include "move_data.h" #include "filesystem.h" #include "constants/moves.h" -#pragma thumb on - void LoadWazaEntry(u16 waza, struct WazaTbl * dest); // Effectively reads the entirety of the waza_tbl.narc file image. diff --git a/arm9/src/wfc_user_info_warning.c b/arm9/src/wfc_user_info_warning.c index 4ed11613b..602ee3565 100644 --- a/arm9/src/wfc_user_info_warning.c +++ b/arm9/src/wfc_user_info_warning.c @@ -64,7 +64,7 @@ static const struct GraphicsBanks sWFCWarningMsgGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE, }; -THUMB_FUNC void ShowWFCUserInfoWarning(u32 heap_id, u32 a1) +void ShowWFCUserInfoWarning(u32 heap_id, u32 a1) { #pragma unused(a1) struct Window window; diff --git a/include-mw/code16.h b/include-mw/code16.h new file mode 100644 index 000000000..8f2606c24 --- /dev/null +++ b/include-mw/code16.h @@ -0,0 +1 @@ +#pragma thumb on diff --git a/include-mw/code32.h b/include-mw/code32.h new file mode 100644 index 000000000..a1901261a --- /dev/null +++ b/include-mw/code32.h @@ -0,0 +1 @@ +#pragma thumb off diff --git a/include-mw/function_target.h b/include-mw/function_target.h index 84b7e1cda..74ad4494a 100644 --- a/include-mw/function_target.h +++ b/include-mw/function_target.h @@ -1,9 +1,6 @@ #ifndef GUARD_FUNCTION_TARGET_H #define GUARD_FUNCTION_TARGET_H -#define ARM_FUNC _Pragma("thumb off") -#define THUMB_FUNC _Pragma("thumb on") - #define ENUMS_ALWAYS_INT_ON _Pragma("enumsalwaysint on") #define ENUMS_ALWAYS_INT_OFF _Pragma("enumsalwaysint off") #define ENUMS_ALWAYS_INT_RESET _Pragma("enumsalwaysint reset") diff --git a/include/global.h b/include/global.h index 8353ed2c9..7001588de 100644 --- a/include/global.h +++ b/include/global.h @@ -18,4 +18,6 @@ extern const u8 gGameLanguage; extern const u8 gGameVersion; #endif //IN_MAIN_C +#include "code16.h" + #endif //GUARD_GLOBAL_H diff --git a/include/scrcmd.h b/include/scrcmd.h index d4e907f12..24c627091 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -168,7 +168,13 @@ BOOL ScrCmd_Unk00A3(ScriptContext *ctx); BOOL ScrCmd_Unk00A4(ScriptContext *ctx); BOOL ScrCmd_Unk0207(ScriptContext *ctx); BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx); - BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx); +BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx); +BOOL ScrCmd_Unk0209(ScriptContext *ctx); +BOOL ScrCmd_Unk028D(ScriptContext *ctx); +BOOL ScrCmd_Unk028E(ScriptContext *ctx); +BOOL ScrCmd_Unk020A(ScriptContext *ctx); +BOOL ScrCmd_Unk020B(ScriptContext *ctx); +BOOL ScrCmd_Unk00A5(ScriptContext *ctx); // scrcmd_mart.c BOOL ScrCmd_NormalMart(struct ScriptContext * ctx); From fb195f62b5329cf20e437f3496e00c98bc83c964 Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 8 Jun 2023 05:29:16 +0100 Subject: [PATCH 2/2] more scrcmd --- arm9/asm/scrcmd_asm.s | 139 ---------------------------------------- arm9/asm/unk_02038C78.s | 8 +-- arm9/global.inc | 8 +-- arm9/src/scrcmd.c | 54 ++++++++++++++-- include/scrcmd.h | 5 +- include/script.h | 2 +- 6 files changed, 60 insertions(+), 156 deletions(-) diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 675188c44..23d683f91 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -9,148 +9,9 @@ .extern FUN_0203BBBC .extern FUN_0203BC04 .extern FUN_0203BC3C - .extern FUN_0203BC6C .text - thumb_func_start ScrCmd_Unk00A6 -ScrCmd_Unk00A6: ; 0x0203BF2C - push {r3-r6, lr} - sub sp, #0x4 - add r5, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r4, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl GetVarPointer - add r6, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r5, #0x80 - ldr r2, [r5, #0x0] - add r1, r6, #0x0 - str r0, [sp, #0x0] - ldr r0, [r2, #0x10] - ldr r2, [r2, #0xc] - add r3, r4, #0x0 - bl FUN_020380CC - mov r0, #0x1 - add sp, #0x4 - pop {r3-r6, pc} - .balign 4 - - thumb_func_start ScrCmd_Unk00A7 -ScrCmd_Unk00A7: ; 0x0203BF84 - push {r3-r7, lr} - add r5, r0, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x13 - bl FieldSysGetAttrAddr - add r4, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r7, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl GetVarPointer - add r1, r5, #0x0 - add r1, #0x80 - add r6, r0, #0x0 - ldr r1, [r1, #0x0] - mov r0, #0xb - mov r2, #0x0 - add r3, r7, #0x0 - bl FUN_0203BC6C - str r0, [r4, #0x0] - cmp r0, #0x0 - bne _0203BFCC - mov r0, #0x1 - strh r0, [r6, #0x0] - pop {r3-r7, pc} -_0203BFCC: - mov r0, #0x0 - strh r0, [r6, #0x0] - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - ldr r1, [r4, #0x0] - bl FUN_02038130 - ldr r1, _0203BFE8 ; =FUN_0203BB90 - add r0, r5, #0x0 - bl SetupNativeScript - mov r0, #0x1 - pop {r3-r7, pc} - .balign 4 -_0203BFE8: .word FUN_0203BB90 - - thumb_func_start ScrCmd_Unk00A8 -ScrCmd_Unk00A8: ; 0x0203BFEC - push {r3-r7, lr} - add r5, r0, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - mov r1, #0x13 - bl FieldSysGetAttrAddr - add r4, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r7, r0, #0x0 - add r0, r5, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl GetVarPointer - add r1, r5, #0x0 - add r1, #0x80 - add r6, r0, #0x0 - ldr r1, [r1, #0x0] - mov r0, #0xb - mov r2, #0x1 - add r3, r7, #0x0 - bl FUN_0203BC6C - str r0, [r4, #0x0] - cmp r0, #0x0 - bne _0203C034 - mov r0, #0x1 - strh r0, [r6, #0x0] - pop {r3-r7, pc} -_0203C034: - mov r0, #0x0 - strh r0, [r6, #0x0] - add r0, r5, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - ldr r1, [r4, #0x0] - bl FUN_02038130 - ldr r1, _0203C050 ; =FUN_0203BB90 - add r0, r5, #0x0 - bl SetupNativeScript - mov r0, #0x1 - pop {r3-r7, pc} - .balign 4 -_0203C050: .word FUN_0203BB90 - thumb_func_start ScrCmd_Unk012E ScrCmd_Unk012E: ; 0x0203C054 push {r4-r6, lr} diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 7c6aefa71..77d14838c 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -313,11 +313,11 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_RestoreOverworld .word ScrCmd_Unk00A2 .word ScrCmd_Unk00A3 - .word ScrCmd_Unk00A4 + .word ScrCmd_GetDressupPortraitSlot .word ScrCmd_Unk00A5 - .word ScrCmd_Unk00A6 - .word ScrCmd_Unk00A7 - .word ScrCmd_Unk00A8 + .word ScrCmd_DressupPokemon + .word ScrCmd_ShowDressedPokemon + .word ScrCmd_ShowContestPokemon .word ScrCmd_Unk00A9 .word ScrCmd_Unk00AA .word ScrCmd_MonStoragePC diff --git a/arm9/global.inc b/arm9/global.inc index 23cf79999..0370be55a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2829,7 +2829,7 @@ .extern ScrCmd_TerminateOverworldProcess .extern ScrCmd_Unk00A2 .extern ScrCmd_Unk00A3 -.extern ScrCmd_Unk00A4 +.extern ScrCmd_GetDressupPortraitSlot .extern ScrCmd_Unk0207 .extern ScrCmd_ShowPokemonPic .extern ScrCmd_ShowPartyPokemonPic @@ -2839,9 +2839,9 @@ .extern ScrCmd_Unk020A .extern ScrCmd_Unk020B .extern ScrCmd_Unk00A5 -.extern ScrCmd_Unk00A6 -.extern ScrCmd_Unk00A7 -.extern ScrCmd_Unk00A8 +.extern ScrCmd_DressupPokemon +.extern ScrCmd_ShowDressedPokemon +.extern ScrCmd_ShowContestPokemon .extern ScrCmd_Unk012E .extern ScrCmd_Unk012F .extern ScrCmd_Unk0130 diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index e5e73258b..70fa7ad46 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -117,6 +117,8 @@ extern void Script_SetMonSeenFlagBySpecies(struct FieldSystem *fieldSystem, u16 extern void MOD05_021E1374(struct TaskManager *taskManager, MessageFormat *messageFormat, u16 *ptr); extern void MOD05_021E1994(FieldSystem *fieldSystem, LocalMapObject *lastInteracted); extern void FUN_0208A338(struct TaskManager *taskManager); +extern void FUN_020380CC(struct TaskManager *taskManager, u16 *param1, struct SaveBlock2 *save, u16 partyPos, u16 param4); +extern void FUN_02038130(FieldSystem *fieldSystem, FashionAppData *fashionData); u8 UNK_021C5A0C[4]; @@ -146,7 +148,7 @@ static BOOL FUN_0203B218(struct ScriptContext *ctx); /*static*/ BOOL FUN_0203BBBC(ScriptContext *ctx); /*static*/ BOOL FUN_0203BC04(ScriptContext *ctx); /*static*/ BOOL FUN_0203BC3C(struct FieldSystem *fieldSystem, u32 param1, u32 param2); -/*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 param3); +static FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 portraitSlot); static BOOL FUN_0203BE9C(ScriptContext *ctx); extern u8 sScriptConditionTable[6][3]; @@ -1973,16 +1975,16 @@ BOOL ScrCmd_TerminateOverworldProcess(ScriptContext *ctx) { //01F8 return TRUE; } -/*static*/ FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 param3) { +static FashionAppData *FUN_0203BC6C(u32 heapId, struct FieldSystem *fieldSystem, u32 param2, u32 portraitSlot) { SaveFashionData *fashionData = Save_FashionData_Get(fieldSystem->saveBlock2); - if (!FUN_0203BC3C(fieldSystem, param2, param3)) { + if (!FUN_0203BC3C(fieldSystem, param2, portraitSlot)) { return NULL; } FashionAppData *appData = AllocFromHeap(heapId, sizeof(FashionAppData)); __builtin__clear(appData, sizeof(FashionAppData)); appData->fashionData = fashionData; appData->unk08 = param2; - appData->unk04 = param3; + appData->portraitSlot = portraitSlot; return appData; } @@ -1996,10 +1998,10 @@ BOOL ScrCmd_Unk00A3(ScriptContext *ctx) { //00A3 return TRUE; } -BOOL ScrCmd_Unk00A4(ScriptContext *ctx) { //00A4 +BOOL ScrCmd_GetDressupPortraitSlot(ScriptContext *ctx) { //00A4 FashionAppData **runningAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); - u16 *unk0 = ScriptGetVarPointer(ctx); - *unk0 = (*runningAppData)->unk04; + u16 *portraitSlotPtr = ScriptGetVarPointer(ctx); + *portraitSlotPtr = (*runningAppData)->portraitSlot; FreeToHeap(*runningAppData); return FALSE; } @@ -2075,3 +2077,41 @@ BOOL ScrCmd_Unk00A5(ScriptContext *ctx) { //00A5 FUN_0208A338(ctx->taskManager); return TRUE; } + +BOOL ScrCmd_DressupPokemon(ScriptContext *ctx) { //00A6 + u16 partyPos = ScriptGetVar(ctx); + u16 *unk0 = ScriptGetVarPointer(ctx); + u16 unk1 = ScriptGetVar(ctx); + FUN_020380CC(ctx->fieldSystem->taskManager, unk0, ctx->fieldSystem->saveBlock2, partyPos, unk1); + return TRUE; +} + +BOOL ScrCmd_ShowDressedPokemon(ScriptContext *ctx) { //00A7 + FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + u16 portraitSlot = ScriptReadHalfword(ctx); + u16 *var = ScriptGetVarPointer(ctx); + *fashionAppData = FUN_0203BC6C(11, ctx->fieldSystem, 0, portraitSlot); + if (*fashionAppData == NULL) { + *var = 1; + return TRUE; + } + *var = 0; + FUN_02038130(ctx->fieldSystem, *fashionAppData); + SetupNativeScript(ctx, FUN_0203BB90); + return TRUE; +} + +BOOL ScrCmd_ShowContestPokemon(ScriptContext *ctx) { //00A8 + FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_RUNNING_APP_DATA); + u16 portraitSlot = ScriptReadHalfword(ctx); + u16 *var = ScriptGetVarPointer(ctx); + *fashionAppData = FUN_0203BC6C(11, ctx->fieldSystem, 1, portraitSlot); + if (*fashionAppData == NULL) { + *var = 1; + return TRUE; + } + *var = 0; + FUN_02038130(ctx->fieldSystem, *fashionAppData); + SetupNativeScript(ctx, FUN_0203BB90); + return TRUE; +} diff --git a/include/scrcmd.h b/include/scrcmd.h index 24c627091..d381053ec 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -165,7 +165,7 @@ BOOL ScrCmd_RestoreOverworld(ScriptContext *ctx); BOOL ScrCmd_TerminateOverworldProcess(ScriptContext *ctx); BOOL ScrCmd_Unk00A2(ScriptContext *ctx); BOOL ScrCmd_Unk00A3(ScriptContext *ctx); -BOOL ScrCmd_Unk00A4(ScriptContext *ctx); +BOOL ScrCmd_GetDressupPortraitSlot(ScriptContext *ctx); BOOL ScrCmd_Unk0207(ScriptContext *ctx); BOOL ScrCmd_ShowPokemonPic(ScriptContext *ctx); BOOL ScrCmd_ShowPartyPokemonPic(ScriptContext *ctx); @@ -175,6 +175,9 @@ BOOL ScrCmd_Unk028E(ScriptContext *ctx); BOOL ScrCmd_Unk020A(ScriptContext *ctx); BOOL ScrCmd_Unk020B(ScriptContext *ctx); BOOL ScrCmd_Unk00A5(ScriptContext *ctx); +BOOL ScrCmd_DressupPokemon(ScriptContext *ctx); +BOOL ScrCmd_ShowDressedPokemon(ScriptContext *ctx); +BOOL ScrCmd_ShowContestPokemon(ScriptContext *ctx); // scrcmd_mart.c BOOL ScrCmd_NormalMart(struct ScriptContext * ctx); diff --git a/include/script.h b/include/script.h index 47952f6a7..75a49d620 100644 --- a/include/script.h +++ b/include/script.h @@ -42,7 +42,7 @@ typedef struct PCBoxAppData { typedef struct FashionAppData { struct SaveFashionData *fashionData; - u32 unk04; + u32 portraitSlot; u32 unk08; } FashionAppData;